Changeset 12815

Timestamp:

2006-09-21T16:55:21+12:00 (18 years ago)

Author:

mdewsnip

Message:

No idea why the static DEFAULT strings weren't being used.

File:

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

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

@@ -89 +89 @@
 
         format_map = new HashMap();
-    format_map.put(DATELIST,"<td>[link][icon][/link]</td>\n<td>[highlight]{Or}{[dls.Title],[dc.Title],[ex.Title],Untitled}[/highlight]</td>\n<td>[ex.Date]</td>");
-    format_map.put(HLIST,"[link][highlight][ex.Title][/highlight][/link]");
-    format_map.put(VLIST,"<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>");   
-    format_map.put(DOCUMENTHEADING,"{Or}{[parent(Top):Title],[Title],untitled}<br>");   
-    format_map.put(DOCUMENTTEXT,"[Text]");      
-    format_map.put( DOCUMENTBUTTONS,"Detach|Highlight");
-    format_map.put( "","");
-        
+    format_map.put(DATELIST, DATELIST_DEFAULT_FORMAT);
+    format_map.put(HLIST, HLIST_DEFAULT_FORMAT);
+    format_map.put(VLIST, VLIST_DEFAULT_FORMAT);
+    format_map.put(DOCUMENTHEADING, DOCUMENTHEADING_DEFAULT_FORMAT);
+    format_map.put(DOCUMENTTEXT, DOCUMENTTEXT_DEFAULT_FORMAT);
+    format_map.put(DOCUMENTBUTTONS, DOCUMENTBUTTONS_DEFAULT_FORMAT);
+        format_map.put("", "");
+
     DebugStream.println("FormatManager: parsed " + getSize() + " format statements.");
     // Establish all of the format objects, so that classifier indexes are initially correct (subsequent refreshes of the model will be sufficient to keep these up to date, as long as we start with a live reference to a classifier.
@@ -681 +681 @@
                 }
                 else {
-                   ///ystem.err.println("Value type");
+                ///ystem.err.println("Value type");
                 ///election_pane.add(part_pane);
                 card_layout.show(control_pane, VALUE);