Changeset 25635 for main/trunk/greenstone3/src/java/org/greenstone/admin/gui/ConfPane.java

Timestamp:

2012-05-22T13:01:04+12:00 (12 years ago)

Author:

sjm84

Message:

Fixing Greenstone 3's use (or lack thereof) of generics, this was done automatically so we may want to change it over time. This change will also auto-format any files that have not already been formatted.

File:

• main/trunk/greenstone3/src/java/org/greenstone/admin/gui/ConfPane.java (modified) (6 diffs)

main/trunk/greenstone3/src/java/org/greenstone/admin/gui/ConfPane.java

@@ -81 +81 @@
 
     protected JPanel main_contentPane = null;
-    public Hashtable conf_table;
+    public Hashtable<Object, Object> conf_table;
 
     /** The panel that contains a Conf_list */
@@ -158 +158 @@
 
     //An array to store all the details in the build.properties file
-    private ArrayList conf_array;
+    private ArrayList<String> conf_array;
 
     //Site configuration
@@ -172 +172 @@
     public ConfPane()
     {
-        conf_table = new Hashtable();
+        conf_table = new Hashtable<Object, Object>();
         // create all the control button panes
         inner_control_pane = new JPanel();
@@ -652 +652 @@
     {
         String new_string;
-        Enumeration keys = conf_table.keys();
+        Enumeration<Object> keys = conf_table.keys();
         String key;
         String value;
@@ -662 +662 @@
             for (int j = 0; j < conf_array.size(); j++)
             {
-                if (((String) conf_array.get(j)).startsWith(key.toLowerCase()))
+                if (conf_array.get(j).startsWith(key.toLowerCase()))
                 {
                     new_string = key + "=" + value;
@@ -719 +719 @@
          * store all the details from the build.properties
          */
-        conf_array = new ArrayList();
+        conf_array = new ArrayList<String>();
         conf_setting = new Object[rowLength][colLength];
         try