From d2ab7a68e4c3f1e619af3576e1443afa2f98cdfd Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Thu, 06 Mar 2014 14:32:08 -0500
Subject: [PATCH] Fixed bug in merge: improper use of force and failing on FORCED result
---
src/main/java/com/gitblit/client/NameRenderer.java | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/gitblit/client/NameRenderer.java b/src/main/java/com/gitblit/client/NameRenderer.java
index 4cbb590..29b8f9b 100644
--- a/src/main/java/com/gitblit/client/NameRenderer.java
+++ b/src/main/java/com/gitblit/client/NameRenderer.java
@@ -26,9 +26,9 @@
/**
* Repository name cell renderer. This renderer shows the group name in a gray
* color and accentuates the repository name in a cornflower blue color.
- *
+ *
* @author James Moger
- *
+ *
*/
public class NameRenderer extends DefaultTableCellRenderer implements ListCellRenderer {
@@ -56,6 +56,7 @@
return sb.toString();
}
+ @Override
public Component getTableCellRendererComponent(JTable table, Object value, boolean isSelected,
boolean hasFocus, int row, int column) {
super.getTableCellRendererComponent(table, value, isSelected, hasFocus, row, column);
--
Gitblit v1.9.1