Changeset 10341

Timestamp:

2005-07-28T15:32:08+12:00 (19 years ago)

Author:

kjdon

Message:

when change the order of the classifiers, now it calls refresh in the format manager to update the CLx format statements

Location:

trunk/gli/src/org/greenstone/gatherer/cdm

Files:

• ClassifierManager.java (modified) (3 diffs)
• FormatManager.java (modified) (2 diffs)

trunk/gli/src/org/greenstone/gatherer/cdm/ClassifierManager.java

@@ -204 +204 @@
         addBefore(classifier, first_classifier);
         first_classifier = null;
-        Gatherer.c_man.configurationChanged();
         }
         else {
@@ -228 +227 @@
         remove(classifier);
         add(index, classifier);
-        Gatherer.c_man.configurationChanged();
         }
         else {
@@ -241 +239 @@
         remove(classifier);
         add(index, classifier);
-        Gatherer.c_man.configurationChanged();
-        }
-    }
-    }
-
+        }
+    }
+    
+    Gatherer.c_man.configurationChanged();
+    // tell the format manager to update the names of its format statements
+    Gatherer.c_man.getCollection().cdm.format_manager.refresh();
+    }
+    
     /** This method removes an assigned classifier. I was tempted to call it unassign, but remove is more consistant. Note that there is no way to remove a classifier from the library.
      * @param classifier The Classifier to remove

trunk/gli/src/org/greenstone/gatherer/cdm/FormatManager.java

@@ -146 +146 @@
     }
 
+    /** updates the format model */
+    public synchronized void refresh() {
+    for(int i = 0; i < getSize(); i++) {
+        Format format = (Format) getElementAt(i);
+        format.update();
+        format = null;
+    }
+    super.refresh();
+    }
     /** Method to remove a format.
      * @param format The <strong>Format</strong> to remove.
@@ -430 +439 @@
     public void loseFocus() {
         // Force all of the Formats to update their names with the correct values.
-        int size = model.getSize();
-        for(int i = 0; i < size; i++) {
-        Format format = (Format) model.getElementAt(i);
-        format.update();
-        format = null;
-        }
+        // do we need to do this on loseFocus???
+        model.refresh();
     }