From 90b8d7e0e1b5e5ed296c1213168b9a8937ac66fd Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Thu, 02 Feb 2012 20:02:40 -0500
Subject: [PATCH] Refactored and unit tested updating HEAD feature
---
src/com/gitblit/client/EditRepositoryDialog.java | 21 ++++++++++-----------
1 files changed, 10 insertions(+), 11 deletions(-)
diff --git a/src/com/gitblit/client/EditRepositoryDialog.java b/src/com/gitblit/client/EditRepositoryDialog.java
index eaf7e0c..4d3485d 100644
--- a/src/com/gitblit/client/EditRepositoryDialog.java
+++ b/src/com/gitblit/client/EditRepositoryDialog.java
@@ -98,7 +98,7 @@
private JComboBox ownerField;
- private JComboBox defaultHeadField;
+ private JComboBox headRefField;
private JPalette<String> usersPalette;
@@ -158,13 +158,13 @@
anRepository.origin == null ? "" : anRepository.origin, 40);
originField.setEditable(false);
- if (ArrayUtils.isEmpty(anRepository.availableHeads)) {
- defaultHeadField = new JComboBox();
- defaultHeadField.setEnabled(false);
+ if (ArrayUtils.isEmpty(anRepository.availableRefs)) {
+ headRefField = new JComboBox();
+ headRefField.setEnabled(false);
} else {
- defaultHeadField = new JComboBox(
- anRepository.availableHeads.toArray());
- defaultHeadField.setSelectedItem(anRepository.defaultHead);
+ headRefField = new JComboBox(
+ anRepository.availableRefs.toArray());
+ headRefField.setSelectedItem(anRepository.HEAD);
}
ownerField = new JComboBox();
@@ -213,8 +213,7 @@
descriptionField));
fieldsPanel
.add(newFieldPanel(Translation.get("gb.origin"), originField));
- fieldsPanel.add(newFieldPanel(Translation.get("gb.defaultHead"),
- defaultHeadField));
+ fieldsPanel.add(newFieldPanel(Translation.get("gb.head"), headRefField));
fieldsPanel.add(newFieldPanel(Translation.get("gb.owner"), ownerField));
fieldsPanel.add(newFieldPanel(Translation.get("gb.enableTickets"),
@@ -404,8 +403,8 @@
repository.description = descriptionField.getText();
repository.owner = ownerField.getSelectedItem() == null ? null
: ownerField.getSelectedItem().toString();
- repository.defaultHead = defaultHeadField.getSelectedItem() == null ? null
- : defaultHeadField.getSelectedItem().toString();
+ repository.HEAD = headRefField.getSelectedItem() == null ? null
+ : headRefField.getSelectedItem().toString();
repository.useTickets = useTickets.isSelected();
repository.useDocs = useDocs.isSelected();
repository.showRemoteBranches = showRemoteBranches.isSelected();
--
Gitblit v1.9.1