Changeset 5755

Timestamp:

2003-10-29T12:19:15+13:00 (20 years ago)

Author:

jmt12

Message:

Repaired the thing I broke last week which caused flag formats to be displayed as value types

File:

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

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

@@ -83 +83 @@
     // Ensure the default formats for DateList, HList and VList are assigned
     if(getFormat("DateList") == null) {
-       addFormat(new Format("","DateList","<td>[link][icon][/link]</td><td>[highlight]{Or}{[Title],Untitled}[/highlight]</td><td>[Date]</td>"));
+       addFormat(new Format("","DateList","<td>[link][icon][/link]</td><td>[highlight]{Or}{[dls.Title],[dc.Title],[Title],Untitled}[/highlight]</td><td>[Date]</td>"));
     }
     
     if(getFormat("HList") == null) {
-       addFormat(new Format("","HList","[link][highlight][Title][/highlight][/link]"));
+       addFormat(new Format("","HList","[link][highlight]{Or}{[dls.Title],[dc.Title],[Title],Untitled}[/highlight][/link]"));
     }
     
     if(getFormat("VList") == null) {
-       addFormat(new Format("","VList","<td valign=top>[link][icon][/link]</td><td valign=top>[srclink]{Or}{[thumbicon],[srcicon]}[/srclink]</td><td valign=top>[highlight]{Or}{[Title],[dc.Title],[dls.Title],Untitled}[/highlight]{If}{[Source],<br><i>([Source])</i>}</td>"));
+       addFormat(new Format("","VList","<td valign=top>[link][icon][/link]</td><td valign=top>[srclink]{Or}{[thumbicon],[srcicon]}[/srclink]</td><td valign=top>[highlight]{Or}{[dls.Title],[dc.Title],[Title],Untitled}[/highlight]{If}{[Source],<br><i>([Source])</i>}</td>"));
     }
     }
@@ -170 +170 @@
    
     private HashMap buildDefaultMappings(ArrayList features_model, ArrayList parts_model) {
-       System.err.println("buildDefaultMappings(): replace me with something that reads in a data xml file.");
+       Gatherer.println("buildDefaultMappings(): replace me with something that reads in a data xml file.");
     return new HashMap();
     }
@@ -190 +190 @@
 
     private ArrayList buildPartModel() {
-    System.err.println("buildPartModel(): replace me with something that reads in a data xml file.");
+    Gatherer.println("buildPartModel(): replace me with something that reads in a data xml file.");
     ArrayList part_model = new ArrayList();
     part_model.add(new Part("", ""));
@@ -201 +201 @@
 
     private ArrayList buildVariableModel() {
-    System.err.println("buildVariableModel(): replace me with something that reads in a data xml file.");
+    Gatherer.println("buildVariableModel(): replace me with something that reads in a data xml file.");
     ArrayList variable_model = new ArrayList();
     variable_model.add("[Text]");
@@ -531 +531 @@
             Entry entry = (Entry) feature_combobox.getSelectedItem();
             String name = entry.toString();
-            if(Format.isParamType(name)) {
-            // Flags first.
-               selection_pane.remove(part_pane);
-               //selection_pane.add(blank_pane);
-            card_layout.show(control_pane, FLAG);
-            view_type = FLAG;
-            }
-            else {
-               //selection_pane.remove(blank_pane);
-               selection_pane.add(part_pane);
-            card_layout.show(control_pane, VALUE);
-            view_type = VALUE;
-            }
-            control_pane.updateUI();
             // Add is only enabled if there isn't already a format for the choosen feature and part. Create a dummy format and test if itsa already in the model
             Object f = entry.getFeature();
@@ -556 +542 @@
             }
             else {
-            name = Format.generateName(f, pname);
-            Format format = getFormat(name);
-            // If there is an existing feature, select it.
-            if(format != null) {
+               Format format = getFormat(Format.generateName(f, pname));
+               // If there is an existing feature, select it, and use it to determine what controls are visible
+               if(format != null) {
+              ///ystem.err.println("There is an existing format!");
                 format_list.setSelectedValue(format, true);
                 // Now use type to determine what controls are visible, and what have initial values.
                 if(format.isParamType()) {
+                   ///ystem.err.println("Flag type");
                 // Flags first.
                 selection_pane.remove(part_pane);
@@ -571 +558 @@
                 }
                 else {
+                   ///ystem.err.println("Value type");
                 selection_pane.add(part_pane);
                 card_layout.show(control_pane, VALUE);
@@ -579 +567 @@
                 control_pane.updateUI();
                 remove_button.setEnabled(true);
-            }
+               }
+               // Otherwise there is no existing format, so we proceed by checking against the feature name
             else {
+               ///ystem.err.println("No existing format");
                 format_list.clearSelection();
                 if(Format.isParamType(name)) {
+                   ///ystem.err.println("Flag type");
                 // Flags first.
                 selection_pane.remove(part_pane);
@@ -591 +582 @@
                 }
                 else {
+                   ///ystem.err.println("Value type");
                 selection_pane.add(part_pane);
                 card_layout.show(control_pane, VALUE);