From f3ff376a5eb945f15329b66bbb7d69ed3ca2ce3f Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Fri, 03 Aug 2012 20:39:50 -0400
Subject: [PATCH] Confirmed fix for GO settings manipulation (issue 85)
---
src/com/gitblit/client/IndicatorsRenderer.java | 14 +++-----------
1 files changed, 3 insertions(+), 11 deletions(-)
diff --git a/src/com/gitblit/client/IndicatorsRenderer.java b/src/com/gitblit/client/IndicatorsRenderer.java
index 8c13122..3622db7 100644
--- a/src/com/gitblit/client/IndicatorsRenderer.java
+++ b/src/com/gitblit/client/IndicatorsRenderer.java
@@ -16,7 +16,7 @@
package com.gitblit.client;
import java.awt.Component;
-import java.awt.GridLayout;
+import java.awt.FlowLayout;
import java.io.Serializable;
import javax.swing.ImageIcon;
@@ -55,7 +55,7 @@
private final ImageIcon federatedIcon;
public IndicatorsRenderer() {
- super(new GridLayout(1, 0, 1, 0));
+ super(new FlowLayout(FlowLayout.RIGHT, 1, 0));
blankIcon = new ImageIcon(getClass().getResource("/blank.png"));
pushIcon = new ImageIcon(getClass().getResource("/lock_go_16x16.png"));
pullIcon = new ImageIcon(getClass().getResource("/lock_pull_16x16.png"));
@@ -81,29 +81,21 @@
JLabel icon = new JLabel(tixIcon);
tooltip.append(Translation.get("gb.tickets")).append("<br/>");
add(icon);
- } else {
- add(new JLabel(blankIcon));
}
if (model.useDocs) {
JLabel icon = new JLabel(doxIcon);
tooltip.append(Translation.get("gb.docs")).append("<br/>");
add(icon);
- } else {
- add(new JLabel(blankIcon));
}
if (model.isFrozen) {
JLabel icon = new JLabel(frozenIcon);
tooltip.append(Translation.get("gb.isFrozen")).append("<br/>");
add(icon);
- } else {
- add(new JLabel(blankIcon));
}
if (model.isFederated) {
JLabel icon = new JLabel(federatedIcon);
tooltip.append(Translation.get("gb.isFederated")).append("<br/>");
add(icon);
- } else {
- add(new JLabel(blankIcon));
}
switch (model.accessRestriction) {
@@ -119,7 +111,7 @@
}
case CLONE: {
JLabel icon = new JLabel(pullIcon);
- tooltip.append(Translation.get("gb.pullRestricted")).append("<br/>");
+ tooltip.append(Translation.get("gb.cloneRestricted")).append("<br/>");
add(icon);
break;
}
--
Gitblit v1.9.1