From 08d86d5b8852cab1837a53cc2c56bb661da59499 Mon Sep 17 00:00:00 2001
From: John Crygier <john.crygier@aon.com>
Date: Mon, 07 May 2012 08:43:19 -0400
Subject: [PATCH] Make the variables / messages more consistant
---
src/com/gitblit/wicket/pages/EditRepositoryPage.java | 22 +++++++++++-----------
1 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/src/com/gitblit/wicket/pages/EditRepositoryPage.java b/src/com/gitblit/wicket/pages/EditRepositoryPage.java
index 13b9e5a..f3e2c38 100644
--- a/src/com/gitblit/wicket/pages/EditRepositoryPage.java
+++ b/src/com/gitblit/wicket/pages/EditRepositoryPage.java
@@ -165,17 +165,17 @@
definedProperties.add(new AbstractMap.SimpleEntry<String, String>(customFieldProperty[0], customFieldProperty[1]));
}
- final ListView<Entry<String, String>> customDefinedProperties = new ListView<Entry<String, String>>("customDefinedProperties", definedProperties) {
+ final ListView<Entry<String, String>> customFieldsListView = new ListView<Entry<String, String>>("customFieldsListView", definedProperties) {
@Override
protected void populateItem(ListItem<Entry<String, String>> item) {
- String value = repositoryModel.customDefinedProperties.get(item.getModelObject().getKey());
+ String value = repositoryModel.customFields.get(item.getModelObject().getKey());
item.add(new Label(item.getModelObject().getKey(), item.getModelObject().getValue())); // Used to get the key later
- item.add(new Label("customLabel", item.getModelObject().getValue()));
- item.add(new TextField<String>("customValue", new Model<String>(value)));
+ item.add(new Label("customFieldLabel", item.getModelObject().getValue()));
+ item.add(new TextField<String>("customFieldValue", new Model<String>(value)));
}
};
- customDefinedProperties.setReuseItems(true);
+ customFieldsListView.setReuseItems(true);
CompoundPropertyModel<RepositoryModel> model = new CompoundPropertyModel<RepositoryModel>(
repositoryModel);
@@ -278,12 +278,12 @@
repositoryModel.postReceiveScripts = postReceiveScripts;
// Loop over each of the user defined properties
- for (int i = 0; i < customDefinedProperties.size(); i++) {
- ListItem<ListItemModel<String>> item = (ListItem<ListItemModel<String>>) customDefinedProperties.get(i);
+ for (int i = 0; i < customFieldsListView.size(); i++) {
+ ListItem<ListItemModel<String>> item = (ListItem<ListItemModel<String>>) customFieldsListView.get(i);
String key = item.get(0).getId(); // Item 0 is our 'fake' label
String value = ((TextField<String>)item.get(2)).getValue(); // Item 2 is out text box
- repositoryModel.customDefinedProperties.put(key, value);
+ repositoryModel.customFields.put(key, value);
}
// save the repository
@@ -371,13 +371,13 @@
form.add(new BulletListPanel("inheritedPostReceive", "inherited", GitBlit.self()
.getPostReceiveScriptsInherited(repositoryModel)));
- WebMarkupContainer customDefinedPropertiesSection = new WebMarkupContainer("customDefinedPropertiesSection") {
+ WebMarkupContainer customFiledsSection = new WebMarkupContainer("customFiledsSection") {
public boolean isVisible() {
return GitBlit.getString(Keys.repository.customFields, "").isEmpty() == false;
};
};
- customDefinedPropertiesSection.add(customDefinedProperties);
- form.add(customDefinedPropertiesSection);
+ customFiledsSection.add(customFieldsListView);
+ form.add(customFiledsSection);
form.add(new Button("save"));
Button cancel = new Button("cancel") {
--
Gitblit v1.9.1