Changeset 12816

Timestamp:

2006-09-21T17:02:52+12:00 (18 years ago)

Author:

mdewsnip

Message:

Changed format_map to default_format_map to be a bit more obvious, and fixed a bug where DocumentHeading, DocumentText and DocumentButtons defaults weren't available.

File:

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

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

@@ -75 +75 @@
     static final private String SEARCHTYPES_DEFAULT_FORMAT = "plain,form";
 
-    static private  HashMap format_map = null ;     
+    static private HashMap default_format_map = null;
 
     /** The controls used to edit the format commands. */
@@ -88 +88 @@
     this.model = this;
 
-        format_map = new HashMap();
-    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("", "");
+        default_format_map = new HashMap();
+    default_format_map.put(DATELIST, DATELIST_DEFAULT_FORMAT);
+    default_format_map.put(HLIST, HLIST_DEFAULT_FORMAT);
+    default_format_map.put(VLIST, VLIST_DEFAULT_FORMAT);
+    default_format_map.put(DOCUMENTHEADING, DOCUMENTHEADING_DEFAULT_FORMAT);
+    default_format_map.put(DOCUMENTTEXT, DOCUMENTTEXT_DEFAULT_FORMAT);
+    default_format_map.put(DOCUMENTBUTTONS, DOCUMENTBUTTONS_DEFAULT_FORMAT);
+        default_format_map.put("", "");
 
     DebugStream.println("FormatManager: parsed " + getSize() + " format statements.");
@@ -162 +162 @@
     }
     }
+
 
     private Format getFormat(String name) {
@@ -687 +688 @@
                 // Initial value
 
-                editor_textarea.setText(part.getDefaultFormat());
+                editor_textarea.setText((String) default_format_map.get(f.toString()));
                                 editor_textarea.setCaretPosition(0);
                        
@@ -973 +974 @@
             // Initial value
             if (pname !=null && pname.length()!=0 ){
-                editor_textarea.setText((String)format_map.get(pname));
+                editor_textarea.setText((String) default_format_map.get(pname));
                 editor_textarea.setCaretPosition(0);
             }
             else{
-                editor_textarea.setText((String)format_map.get(name));
+                editor_textarea.setText((String) default_format_map.get(name));
                 editor_textarea.setCaretPosition(0);
             }