Changeset 10421

Timestamp:

2005-08-04T15:49:05+12:00 (19 years ago)

Author:

kjdon

Message:

added DocumentText, DocumentButtons and DocumentHeading default formats. also removed Invisible from the part list

Location:

trunk/gli/src/org/greenstone/gatherer/cdm

Files:

• Format.java (modified) (1 diff)
• FormatManager.java (modified) (4 diffs)

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

@@ -41 +41 @@
 
     /** The default features (not all of these are in the Greenstone Developer's Guide). */
-    static final public String DEFAULT_FEATURES[] = { "", "AllowExtendedOptions", "DocumentArrowsBottom", "DocumentArrowsTop", "DocumentButtons", "DocumentContents", "DocumentHeading", "DocumentImages", "DocumentText", "DocumentTitles", "DocumentUseHTML", "RelatedDocuments", "Search" };
+    static final public String DEFAULT_FEATURES[] = { "", "AllowExtendedOptions", "Document", "DocumentArrowsBottom", "DocumentArrowsTop", "DocumentButtons", "DocumentContents", "DocumentHeading", "DocumentImages", "DocumentText", "DocumentTitles", "DocumentUseHTML", "RelatedDocuments", "Search" };
     /** The list of known feature parts. */
-    static final public String DEFAULT_PARTS[] = { "", "DateList", "HList", "Invisible", "VList" };
+    static final public String DEFAULT_PARTS[] = { "", "DateList", "HList", "VList" };
 
     /** Only "" and "Search" can have parts */
     static public boolean canHavePart(String name) {
-    return (name.equalsIgnoreCase("") || name.equalsIgnoreCase("Search"));
+    return (name.equalsIgnoreCase("") || name.equalsIgnoreCase("Search") || name.equalsIgnoreCase("Document"));
     }
     

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

@@ -60 +60 @@
     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 = "";
-
+    //    static final private String INVISIBLE = "Invisible";
+    //static final private String INVISIBLE_DEFAULT_FORMAT = "";
+
+    static final private String DOCUMENTHEADING = "DocumentHeading";
+    static final private String DOCUMENTHEADING_DEFAULT_FORMAT = "{Or}{[parent(Top):Title],[Title],untitled}<br>";
+
+    static final private String DOCUMENTTEXT = "DocumentText";
+    static final private String DOCUMENTTEXT_DEFAULT_FORMAT = "<center><table width=_pagewidth_><tr><td>[Text]</td></tr></table></center>";
+
+    static final private String DOCUMENTBUTTONS = "DocumentButtons";
+    static final private String DOCUMENTBUTTONS_DEFAULT_FORMAT = "Detach|Highlight";
+    
     /** The controls used to edit the format commands. */
     private Control controls = null;
@@ -91 +100 @@
         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));
+    }
+    
     }
 
@@ -188 +208 @@
     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(INVISIBLE, INVISIBLE_DEFAULT_FORMAT));
     part_model.add(new Part(VLIST, VLIST_DEFAULT_FORMAT));
     return part_model;
@@ -533 +553 @@
             if (entry.canHavePart()) {
             part_combobox.setEnabled(true);
-            part_combobox.setSelectedIndex(4);
+            part_combobox.setSelectedIndex(part_combobox.getModel().getSize()-1);
 
             } else {