Changeset 9887

Timestamp:

2005-05-16T17:04:24+12:00 (19 years ago)

Author:

mdewsnip

Message:

Tidied up the way the Warnings preferences are done, in response to my recent config.xml file updating code.

File:

• trunk/gli/src/org/greenstone/gatherer/gui/Preferences.java (modified) (1 diff)

trunk/gli/src/org/greenstone/gatherer/gui/Preferences.java

@@ -496 +496 @@
     }
 
+
     /** The warning preferences are controlled through a checklist. */
-    private JPanel createWarningPreferences() {
-    // Retrieve all of the warning preferences settings.
-    HashMap warning_preferences = Configuration.getAll("warning\\..*", true);
+    private JPanel createWarningPreferences()
+    {
     warning_preferences_check_list = new CheckList(false);
-    for(Iterator keys = warning_preferences.keySet().iterator(); keys.hasNext(); ) {
-        String property = (String) keys.next();
-        String value = (String) warning_preferences.get(property);
-        // Remove 'warning.'
-        String title = Dictionary.get(property.substring(8) + ".Title");
-        CheckListEntry entry = new CheckListEntry(title, value.equalsIgnoreCase(TRUE));
-        entry.setProperty(property);
-        warning_preferences_check_list.addEntry(entry);
-    }
-    // Creation
+
+    // Read all the warnings from the general xml/config.xml file, and their values from the user config.xml file
+    Document general_config_xml_file_document = Utility.parse("xml/config.xml", true);
+    NodeList argument_elements_nodelist = general_config_xml_file_document.getDocumentElement().getElementsByTagName("Argument");
+    for (int i = 0; i < argument_elements_nodelist.getLength(); i++) {
+        Element argument_element = (Element) argument_elements_nodelist.item(i);
+        String argument_element_name = argument_element.getAttribute("name");
+        if (argument_element_name.startsWith("warning.")) {
+        String warning_title = Dictionary.get(argument_element_name.substring("warning.".length()) + ".Title");
+        boolean warning_enabled = Configuration.get(argument_element_name, true);
+        CheckListEntry warning_entry = new CheckListEntry(warning_title, warning_enabled);
+        warning_entry.setProperty(argument_element_name);
+        warning_preferences_check_list.addEntry(warning_entry);
+        }
+    }
+
     JPanel warning_preferences_pane = new JPanel();
-    // Connection
-    // Layout
     warning_preferences_pane.setBorder(BorderFactory.createEmptyBorder(5,5,5,5));
     warning_preferences_pane.setLayout(new BorderLayout());
     warning_preferences_pane.add(new JScrollPane(warning_preferences_check_list), BorderLayout.CENTER);
-
     return warning_preferences_pane;
     }
+
 
     private JPanel createWorkflowPreferences() {