Changeset 12302

Timestamp:

2006-07-25T13:48:07+12:00 (18 years ago)

Author:

kjdon

Message:

removed an unused variable and unused method, blank feature and part now display some text, and the part is disabled/enabled properly when the assigned formats list is clicked

File:

• trunk/gli/src/org/greenstone/gatherer/cdm/FormatManager.java (modified) (9 diffs)

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

@@ -162 +162 @@
         controls = null;
     }
-    }
-
-    /** Gets the format indicated by the index.
-     * @param index The location of the desired format, as an <i>int</i>.
-     */
-    private Format getFormat(int index) {
-    Format result = null;
-    if(0 < index && index < getSize()) {
-        result = (Format) getElementAt(index);
-    }
-    return result;
     }
 
@@ -315 +304 @@
         JPanel header_pane = new DesignPaneHeader("CDM.GUI.Formats", "formatstatements");
 
-        JLabel format_label = new JLabel(Dictionary.get("CDM.FormatManager.Assigned_Formats"));
         format_list = new JList(model);
 
@@ -527 +515 @@
         String p = "";
         if (entry.canHavePart()) {
-            p = part_combobox.getSelectedItem().toString();
+            p = ((Part)part_combobox.getSelectedItem()).getName();
         }
 
@@ -776 +764 @@
                view_type = VALUE;
                // Initial values
-               
-               // Try to match the part.
-               String part_entry = format.getPart();
-               // Set Selected Item doesn't work so I'll do this manually
-               boolean found = false;
-               for(int i=0; i < part_combobox.getItemCount(); i++) {
-                  Part a_part = (Part) part_combobox.getItemAt(i);
-                  if(a_part.equals(part_entry)) {
-                 part_combobox.setSelectedItem(a_part);
-                 found = true;
-                  }
-                  a_part = null;
+               // do we have a part?
+               if (format.canHavePart()) {
+                   part_combobox.setEnabled(true);
+                   // Try to match the part.
+                   String part_entry = format.getPart();
+                   // Set Selected Item doesn't work so I'll do this manually
+                   boolean found = false;
+                   for(int i=0; i < part_combobox.getItemCount(); i++) {
+                   Part a_part = (Part) part_combobox.getItemAt(i);
+                   if(a_part.equals(part_entry)) {
+                       part_combobox.setSelectedItem(a_part);
+                       found = true;
+                   }
+                   a_part = null;
+                   }
+                   // If we didn't match anything, add it and select it again
+                   if(!found) {
+                   Part a_part = new Part(part_entry, "");
+                   part_combobox.insertItemAt(a_part, part_combobox.getItemCount());
+                   part_combobox.setSelectedItem(a_part);
+                   
+                   }
+               } else {
+                   part_combobox.setEnabled(false);
+                   part_combobox.setSelectedIndex(0);
                }
-               // If we didn't match anything, add it and select it again
-               if(!found) {
-                  Part a_part = new Part(part_entry, "");
-                  part_combobox.insertItemAt(a_part, part_combobox.getItemCount());
-                  part_combobox.setSelectedItem(a_part);
-               
-                           }
-              
                editor_textarea.setText(format.getValue());
                editor_textarea.setCaretPosition(0);
@@ -956 +949 @@
 
 
- private class DefaultListener
+    private class DefaultListener
         implements ActionListener {
 
@@ -1130 +1123 @@
         // Return the classifier - less the 'classify ' prefix and with its CL index shown
         return classifier.getPositionString() + StaticStrings.COLON_CHARACTER + StaticStrings.SPACE_CHARACTER + classifier.toString().substring(9);
+        }
+        if (text.equals("")) {
+        return "<html><body><i>"+Dictionary.get("CDM.FormatManager.AllFeatures")+"</i></body></html>";
         }
         return text;
@@ -1185 +1181 @@
        */
       public int compareTo(Object obj) {
-     return name.compareTo(obj.toString());
+      if (obj instanceof Part) {
+          return name.compareTo(((Part)obj).getName());
+      }
+      return name.compareTo(obj.toString());
       }
       
@@ -1193 +1192 @@
        */
       public boolean equals(Object obj) {
-     return name.equals(obj.toString());
+      if (obj instanceof Part) {
+          return name.equals(((Part)obj).getName());
+      }
+      return name.equals(obj.toString());
       }
       
@@ -1219 +1221 @@
        */
       public String toString() {
-     return name;
+      if (name.equals("")) {
+          return "<html><body><i>"+Dictionary.get("CDM.FormatManager.AllParts")+"</i></body></html>";
+      }
+      return name;
       }
    }