Changeset 12842

Timestamp:

2006-09-25T12:06:37+12:00 (18 years ago)

Author:

kjdon

Message:

Ian hated having a blank format list, so have added back in the default formats. SearchTypes and DateList only added if needed. Made the FeatureListener update the editor properly

File:

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

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

@@ -105 +105 @@
     }
          
-//          // Ensure the default formats for DateList, HList and VList are assigned
-//  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));            
-//  }
-    
-
-//  if (getFormat(DOCUMENTHEADING) == null) {
-//      addFormat(new Format(DOCUMENTHEADING, "", DOCUMENTHEADING_DEFAULT_FORMAT));
-//          }
-
-  
-//  if (getFormat(DOCUMENTTEXT)== null) {
-//      addFormat(new Format(DOCUMENTTEXT,"",DOCUMENTTEXT_DEFAULT_FORMAT));
-//      }
-    
-    
-
-//  if (getFormat(DOCUMENTBUTTONS) == null) {
-//      addFormat(new Format(DOCUMENTBUTTONS,"",DOCUMENTBUTTONS_DEFAULT_FORMAT));
-        
-//  }
-    
-//  // only for mgpp and lucene colls - change!
-//  if (getFormat(SEARCHTYPES)==null) {
-//      addFormat(new Format(SEARCHTYPES, "", SEARCHTYPES_DEFAULT_FORMAT));
-//  }
-    
+    // Ensure the default formats for important format statements are assigned
+    if (getFormat(VLIST) == null) {
+        addFormat(new Format("",VLIST,VLIST_DEFAULT_FORMAT));            
+    }
+    if (getFormat(HLIST) == null) {
+        addFormat(new Format("",HLIST,HLIST_DEFAULT_FORMAT)); 
+    }
+    // only if DateList is used
+    if (getFormat(DATELIST) == null && CollectionDesignManager.classifier_manager.isDateListClassifierAssigned()) {
+        addFormat(new Format("",DATELIST,DATELIST_DEFAULT_FORMAT));        
+    }
+    if (getFormat(DOCUMENTHEADING) == null) {
+        addFormat(new Format(DOCUMENTHEADING, "", DOCUMENTHEADING_DEFAULT_FORMAT));
+        } 
+    if (getFormat(DOCUMENTTEXT)== null) {
+        addFormat(new Format(DOCUMENTTEXT,"",DOCUMENTTEXT_DEFAULT_FORMAT));
+    }
+    if (getFormat(DOCUMENTBUTTONS) == null) {
+        addFormat(new Format(DOCUMENTBUTTONS,"",DOCUMENTBUTTONS_DEFAULT_FORMAT));
+    }
+    // only for mgpp and lucene colls 
+    if (getFormat(SEARCHTYPES)==null && (CollectionDesignManager.index_manager.isMGPP()) || CollectionDesignManager.index_manager.isLucene()) {
+        addFormat(new Format(SEARCHTYPES, "", SEARCHTYPES_DEFAULT_FORMAT));
+    }
+
+
     }
 
@@ -689 +678 @@
                 // Initial value
 
-                editor_textarea.setText((String) default_format_map.get(f.toString()));
+                String feature_default_format = (String) default_format_map.get(f.toString());
+                if (feature_default_format != null) {
+                    
+                    editor_textarea.setText(feature_default_format);
+                }
+                else {
+                    editor_textarea.setText(part.getDefaultFormat());
+                }
                                 editor_textarea.setCaretPosition(0);