From 380afada1de5b97284704163638aafea5f0f0b0d Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Thu, 10 May 2012 09:16:14 -0400
Subject: [PATCH] Changed constants and fixed nullpointer in update repository
---
src/com/gitblit/client/EditRepositoryDialog.java | 10 +++++++++-
1 files changed, 9 insertions(+), 1 deletions(-)
diff --git a/src/com/gitblit/client/EditRepositoryDialog.java b/src/com/gitblit/client/EditRepositoryDialog.java
index 6ad75c6..cc22512 100644
--- a/src/com/gitblit/client/EditRepositoryDialog.java
+++ b/src/com/gitblit/client/EditRepositoryDialog.java
@@ -33,6 +33,8 @@
import java.util.List;
import java.util.Set;
+import javax.swing.Box;
+import javax.swing.BoxLayout;
import javax.swing.DefaultComboBoxModel;
import javax.swing.ImageIcon;
import javax.swing.JButton;
@@ -283,7 +285,8 @@
postReceivePanel.add(postReceivePalette, BorderLayout.CENTER);
postReceivePanel.add(postReceiveInherited, BorderLayout.WEST);
- customFieldsPanel = new JPanel(new VerticalFlowLayout());
+ customFieldsPanel = new JPanel();
+ customFieldsPanel.setLayout(new BoxLayout(customFieldsPanel, BoxLayout.Y_AXIS));
JScrollPane customFieldsScrollPane = new JScrollPane(customFieldsPanel);
customFieldsScrollPane.setHorizontalScrollBarPolicy(ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER);
customFieldsScrollPane.setVerticalScrollBarPolicy(ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED);
@@ -565,6 +568,11 @@
customFieldsPanel.add(newFieldPanel(fieldLabel, 250, textField));
}
+
+ if (customFields.size() < 14) {
+ customFieldsPanel.add(Box.createVerticalGlue());
+ customFieldsPanel.add(Box.createRigidArea(new Dimension(300, 300 - (customFields.size() * 22))));
+ }
}
/**
--
Gitblit v1.9.1