Changeset 5209

Timestamp:

2003-08-19T15:38:01+12:00 (21 years ago)

Author:

jmt12

Message:

Fix 203B120 and 147

Location:

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

Files:

• Classifier.java (modified) (5 diffs)
• ClassifierManager.java (modified) (7 diffs)

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

@@ -33 +33 @@
 import java.io.*;
 import java.util.*;
+import org.greenstone.gatherer.Gatherer;
 import org.greenstone.gatherer.cdm.Argument;
 import org.greenstone.gatherer.cdm.ArgumentContainer;
@@ -50 +51 @@
 
     static final public String CLASSIFIER_PREFIX = "CL";
+
+    private boolean is_abstract = false;
 
     /** A reference to the classifier that this one inherits from. */
@@ -111 +114 @@
             // The trick thing is that we have to create a new element in the DOM as well.
             Argument new_argument = base_argument.copy();
+            new_argument.setOwner(name);
             Element argument_element = CollectionDesignManager.collect_config.document.createElement(StaticStrings.OPTION_ELEMENT);
             argument_element.setAttribute(StaticStrings.NAME_ATTRIBUTE, base_argument_name);
@@ -288 +292 @@
     }
     return position_string;
+    }
+
+    public boolean isAbstract() {
+    return is_abstract;
     }
 
@@ -360 +368 @@
     }
 
+    public void setIsAbstract(boolean is_abstract) {
+    this.is_abstract = is_abstract;
+    }
+
     /** Method to set the value of name. 
      * @param name The new value of name as a <strong>String</strong>.

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

@@ -274 +274 @@
     }
 
+    private Object[] getAvailable() {
+    ArrayList available = new ArrayList();
+    int library_size = library.size();
+    for(int i = 0; i < library_size; i++) {
+        Classifier classifier = (Classifier) library.get(i);
+        if(!classifier.isAbstract()) {
+        available.add(classifier);
+        }
+        classifier = null;
+    }
+    return available.toArray();
+    }
+
     /** Method to extract just the classifiers name from a file object.
      * @param classifier The <strong>File</strong> which references a certain classifier.
@@ -420 +433 @@
         else if(node_name.equals("Desc")) {
         classifier.setDescription(MSMUtils.getValue(node));
+        }
+        else if(node_name.equals(CollectionConfiguration.ABSTRACT_ELEMENT)) {
+        classifier.setIsAbstract(MSMUtils.getValue(node).equalsIgnoreCase(CollectionConfiguration.YES_STR));
         }
         // Parse the multitude of arguments.
@@ -476 +492 @@
             }
             // A super classifier class.
-            else if(node_name.equals("ClasInfo")) {
+            else if(node_name.equals("ClassInfo")) {
             Classifier super_classifier = parseXML(arg);
             classifier.setSuper(super_classifier);
@@ -535 +551 @@
         instructions.setWrapStyleWord(true);
 
-        classifier = new GComboBox(library.toArray());
+        classifier = new GComboBox(getAvailable());
         classifier.setBackgroundNonSelectionColor(Gatherer.config.getColor("coloring.editable_background", false));
         classifier.setBackgroundSelectionColor(Gatherer.config.getColor("coloring.collection_selection_background", false));
@@ -641 +657 @@
 
         classifier_pane.setBorder(BorderFactory.createEmptyBorder(5,0,5,0));
-        classifier_pane.setLayout(new GridLayout(1,2));
+        classifier_pane.setLayout(new GridLayout(1, 2));
         classifier_pane.add(classifier_label);
         classifier_pane.add(classifier);
 
-        button_pane.setLayout(new GridLayout(3,1));
+        button_pane.setLayout(new GridLayout(1, 3));
         button_pane.add(add);
         button_pane.add(configure);
@@ -698 +714 @@
         Object selected_object = classifier.getSelectedItem();
         // If there is something in the combobox, but we haven't registered a selection, then add the object and select it!
-        if(selected_object != null && classifier.getSelectedIndex() == -1) {
-            classifier.insertItemAt(selected_object, classifier.getItemCount());
-        }
         if(selected_object != null) {
+            // Retrieve the base classifier
+            Classifier base_classifier = getBaseClassifier(selected_object.toString());
+
             // Create a new element in the DOM
             Element element = CollectionDesignManager.collect_config.document.createElement(CollectionConfiguration.CLASSIFY_ELEMENT);
             Classifier new_classifier = null;
-            if(selected_object instanceof Classifier) {
-            Classifier base_classifier = (Classifier) selected_object;
+            if(base_classifier != null) {
+            Gatherer.println("Creating Classifier based on existing Classifer.");
             element.setAttribute(CollectionConfiguration.TYPE_ATTRIBUTE, base_classifier.getName());
             new_classifier = new Classifier(element, base_classifier);
-            base_classifier = null;
             }
             else {
+            Gatherer.println("Creating new custom Classifier.");
             element.setAttribute(CollectionConfiguration.TYPE_ATTRIBUTE, selected_object.toString());
             new_classifier = new Classifier(element, null);
+            // Also we add the custom classifier name to the combobox for convienence.
+            classifier.addItem(selected_object);
             }
             element = null;
@@ -729 +747 @@
             ac = null;
             new_classifier = null;
-            classifier.setSelectedIndex(0);
         }
         }