Changeset 7597

Timestamp:

2004-06-16T16:43:32+12:00 (20 years ago)

Author:

kjdon

Message:

made static strings for the format names and default format strings - they were being defined twice. also made the defaults contain ex.metadata

File:

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

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

@@ -64 +64 @@
     static final private String VALUE = "value";
 
+    static final private String DATELIST = "DateList";
+    static final private String DATELIST_DEFAULT_FORMAT = "<td>[link][icon][/link]</td>\n<td>[highlight]{Or}{[dls.Title],[dc.Title],[ex.Title],Untitled}[/highlight]</td>\n<td>[ex.Date]</td>";
+    static final private String HLIST = "HList";
+    static final private String HLIST_DEFAULT_FORMAT = "[link][highlight]{Or}{[dls.Title],[dc.Title],[ex.Title],Untitled}[/highlight][/link]";
+    static final private String VLIST = "VList";
+    static final private String VLIST_DEFAULT_FORMAT = "<td valign=top>[link][icon][/link]</td>\n<td valign=top>[ex.srclink]{Or}{[ex.thumbicon],[ex.srcicon]}[ex./srclink]</td>\n<td valign=top>[highlight]\n{Or}{[dls.Title],[dc.Title],[ex.Title],Untitled}\n[/highlight]{If}{[ex.Source],<br><i>([ex.Source])</i>}</td>";
+    static final private String INVISIBLE = "Invisible";
+    static final private String INVISIBLE_DEFAULT_FORMAT = "";
+
     /** This flag is set if some change has occured to the format commands. When a collection has been built for previewing, and the greenstone local library server is used, then we have to send commands to remove then add the new collection. */
     private boolean formats_changed = false;
@@ -83 +92 @@
 
     // Ensure the default formats for DateList, HList and VList are assigned
-    if (getFormat("DateList") == null) {
-        addFormat(new Format("","DateList","<td>[link][icon][/link]</td>\n<td>[highlight]{Or}{[dls.Title],[dc.Title],[Title],Untitled}[/highlight]</td>\n<td>[Date]</td>"));
-    }
-
-    if (getFormat("HList") == null) {
-        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>\n<td valign=top>[srclink]{Or}{[thumbicon],[srcicon]}[/srclink]</td>\n<td valign=top>[highlight]\n{Or}{[dls.Title],[dc.Title],[Title],Untitled}\n[/highlight]{If}{[Source],<br><i>([Source])</i>}</td>"));
+    if (getFormat(DATELIST) == null) {
+        addFormat(new Format("",DATELIST,DATELIST_DEFAULT_FORMAT));
+    }
+
+    if (getFormat(HLIST) == null) {
+        addFormat(new Format("",HLIST,HLIST_DEFAULT_FORMAT));
+    }
+
+    if (getFormat(VLIST) == null) {
+        addFormat(new Format("",VLIST,VLIST_DEFAULT_FORMAT));
     }
     }
@@ -194 +203 @@
     ArrayList part_model = new ArrayList();
     part_model.add(new Part("", ""));
-    part_model.add(new Part("DateList", "<td>[link][icon][/link]</td><td>[highlight]{Or}{[Title],Untitled}[/highlight]</td><td>[Date]</td>"));
-    part_model.add(new Part("HList", "[link][highlight][Title][/highlight][/link]"));
-    part_model.add(new Part("Invisible", ""));
-    part_model.add(new Part("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>"));
+    part_model.add(new Part(DATELIST, DATELIST_DEFAULT_FORMAT));
+    part_model.add(new Part(HLIST, HLIST_DEFAULT_FORMAT));
+    part_model.add(new Part(INVISIBLE, INVISIBLE_DEFAULT_FORMAT));
+    part_model.add(new Part(VLIST, VLIST_DEFAULT_FORMAT));
     return part_model;
     }