Changeset 4928

Timestamp:

2003-07-15T13:37:35+12:00 (21 years ago)

Author:

jmt12

Message:

Major CDM rewrite so it uses DOM.

Location:

trunk/gli/src/org/greenstone/gatherer

Files:

• Configuration.java (modified) (2 diffs)
• Dictionary.java (modified) (3 diffs)

trunk/gli/src/org/greenstone/gatherer/Configuration.java

@@ -68 +68 @@
     public String proxy_user = null;
     /** The language selected for the interface. Currently hard-wired. */
-    public Language interface_language = new Language("en", "ENGLISH", true);
+    public String interface_language = "en";
     /** The screen size of the desktop the Gatherer will be displayed on. */
     public Dimension screen_size = Toolkit.getDefaultToolkit().getScreenSize();
@@ -608 +608 @@
     UIManager.put("ProgressBar.background", new ColorUIResource(getColor("coloring.collection_tree_background", false)));
     UIManager.put("TextArea.background", new ColorUIResource(getColor("coloring.collection_tree_background", false)));
-    UIManager.put("TextField.background", new ColorUIResource(getColor("coloring.editable_background", false)));
+    UIManager.put("TextField.background", new ColorUIResource(getColor("coloring.editable", false)));
     UIManager.put("Table.background", new ColorUIResource(getColor("coloring.collection_tree_background", false)));
     UIManager.put("List.background", new ColorUIResource(getColor("coloring.collection_tree_background", false)));

trunk/gli/src/org/greenstone/gatherer/Dictionary.java

@@ -216 +216 @@
     public void register(AbstractButton component, String[] args, boolean already_registered) {
     if(component != null) {
-                // Determine the key
+        // Determine the key
         String key = "";
         if(!already_registered) {
@@ -224 +224 @@
         key = args[args.length - 1];
         }
-                // Update the component using the AWTEvent queue
+        // Update the component using the AWTEvent queue
         String value = get(key, args);
         String tooltip = get(key + "_Tooltip", (String[])null);
         ChangeTask task = new AbstractButtonChangeTask(component, key, value, tooltip);
         SwingUtilities.invokeLater(task);
-                // Register as necessary
+        // Register as necessary
         if(!already_registered) {
         args = ArrayTools.add(args, key);
@@ -239 +239 @@
     public void register(JComboBox component, String[] args, boolean already_registered) {
     if(component != null) {
-                // If not already registered then args will be null.
+        // If not already registered then args will be null.
         if(!already_registered) {
         args = new String[component.getItemCount()];
         }
-                // Retrieve the tooltip. The key is mostly derived from the comboboxes name.
+        // Retrieve the tooltip. The key is mostly derived from the comboboxes name.
         String key = component.getName();
         String tooltip = get(key + "_Tooltip", (String[])null);
         ChangeTask task = new JComboBoxChangeTask(component, key, -1, tooltip);
         SwingUtilities.invokeLater(task);
-                // Iterate through the combobox, updating values and recording the original key of each item in args.
+        // Iterate through the combobox, updating values and recording the original key of each item in args.
         for(int i = 0; i < args.length; i++) {
         if(args[i] == null) {