Author: ronvoe122
Date: 2008-08-03 11:24:34-0700
New Revision: 10600
Modified:
trunk/src/java/org/tigris/scarab/tools/ScarabGlobalTool.java
trunk/src/webapp/WEB-INF/templates/screens/admin/AppConfigurationSettings.vm
trunk/src/webapp/style/scarab.css
Log:
SCB2545: sort configuration keys alphabetically. Patch by Johannes Hoechstaedter (tweaked by me).
Modified: trunk/src/java/org/tigris/scarab/tools/ScarabGlobalTool.java
Url: http://scarab.tigris.org/source/browse/scarab/trunk/src/java/org/tigris/scarab/tools/ScarabGlobalTool.java?view=diff&rev=10600&p1=trunk/src/java/org/tigris/scarab/tools/ScarabGlobalTool.java&p2=trunk/src/java/org/tigris/scarab/tools/ScarabGlobalTool.java&r1=10599&r2=10600
==============================================================================
--- trunk/src/java/org/tigris/scarab/tools/ScarabGlobalTool.java (original)
+++ trunk/src/java/org/tigris/scarab/tools/ScarabGlobalTool.java 2008-08-03 11:24:34-0700
@@ -46,8 +46,10 @@
* individuals on behalf of Collab.Net.
*/
+import java.util.Collections;
import java.util.Date;
import java.util.Calendar;
+import java.util.Iterator;
import java.util.List;
import java.util.ArrayList;
import java.util.Set;
@@ -55,6 +57,7 @@
import java.util.Enumeration;
import java.util.Vector;
+import org.apache.commons.configuration.Configuration;
import org.apache.commons.configuration.ConversionException;
import org.apache.commons.lang.StringUtils;
import org.apache.log4j.Logger;
@@ -881,12 +884,26 @@
/**
* @return Return the current turbine configuration with all keys included
*/
- public org.apache.commons.configuration.Configuration getTurbineConfiguration()
+ public Configuration getTurbineConfiguration()
{
return Turbine.getConfiguration();
}
/**
+ * @return Returns a lexicographic ascending sorted list of all keys from the current turbine configuration
+ */
+ public List getTurbineConfigurationKeysSorted()
+ {
+ // TODO: Turbine.configuration should be encapsulated by GlobalParameterManager
+ ArrayList sortedKeys = new ArrayList();
+ for(Iterator keys = Turbine.getConfiguration().getKeys();keys.hasNext();) {
+ sortedKeys.add(keys.next());
+ }
+ Collections.sort(sortedKeys, String.CASE_INSENSITIVE_ORDER);
+ return sortedKeys;
+ }
+
+ /**
* @return Returns the string value of a turbine property. If the property
* does not map to a String, return Object.toString() instead.
*/
Modified: trunk/src/webapp/WEB-INF/templates/screens/admin/AppConfigurationSettings.vm
Url: http://scarab.tigris.org/source/browse/scarab/trunk/src/webapp/WEB-INF/templates/screens/admin/AppConfigurationSettings.vm?view=diff&rev=10600&p1=trunk/src/webapp/WEB-INF/templates/screens/admin/AppConfigurationSettings.vm&p2=trunk/src/webapp/WEB-INF/templates/screens/admin/AppConfigurationSettings.vm&r1=10599&r2=10600
==============================================================================
--- trunk/src/webapp/WEB-INF/templates/screens/admin/AppConfigurationSettings.vm (original)
+++ trunk/src/webapp/WEB-INF/templates/screens/admin/AppConfigurationSettings.vm 2008-08-03 11:24:34-0700
@@ -10,9 +10,9 @@
</p>
<div class="axial">
<table border="0" cellspacing="2" cellpadding="3">
- #foreach($key in $scarabG.TurbineConfiguration.keys)
+ #foreach($key in $scarabG.TurbineConfigurationKeysSorted)
<tr>
- <th>$key</th>
+ <td class="applicationConfiguration">$key</td>
<td>
<input type="hidden" name="configuration.key.$key" value="$key" />
<input type="text" name="configuration.value.$key" value="$scarabG.getTurbineProperty($key)" size="80"/>
Modified: trunk/src/webapp/style/scarab.css
Url: http://scarab.tigris.org/source/browse/scarab/trunk/src/webapp/style/scarab.css?view=diff&rev=10600&p1=trunk/src/webapp/style/scarab.css&p2=trunk/src/webapp/style/scarab.css&r1=10599&r2=10600
==============================================================================
--- trunk/src/webapp/style/scarab.css (original)
+++ trunk/src/webapp/style/scarab.css 2008-08-03 11:24:34-0700
@@ -99,6 +99,13 @@
border: thin solid rgb(255, 170, 170);
}
+td.applicationConfiguration
+{
+ text-align: left;
+ background-color: #E9F1F9;
+ color: black;
+}
+
td.cpTodayText,
td.cpTodayTextDisabled
{
lmpx.com only provides a reader for public news (NNTP) servers. It is not
affiliated with the servers or forums shown here and is not responsible for
the content of articles, which is written by their respective authors.