Changeset 4960 for trunk/gli/src/org/greenstone

Timestamp:

2003-07-16T15:49:12+12:00 (21 years ago)

Author:

jmt12

Message:

Removed custom package from cdm (I'll put it back one day)

Location:

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

Files:

• Classifier.java (modified) (1 diff)
• ClassifierManager.java (modified) (4 diffs)
• FormatManager.java (modified) (5 diffs)

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

@@ -176 +176 @@
      * @param object The classifier to test against, as an <strong>Object</strong>.
      * @return <i>true</i> if the classifier names match, <i>false</i> otherwise.
-     * @see org.greenstone.gatherer.cdm.CustomClassifier
      */
     public boolean equals(Object object) {

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

@@ -46 +46 @@
 import org.greenstone.gatherer.cdm.Control;
 import org.greenstone.gatherer.cdm.Classifier;
-import org.greenstone.gatherer.cdm.CustomClassifier;
 import org.greenstone.gatherer.cdm.DOMProxyListModel;
 import org.greenstone.gatherer.file.FileNode;
@@ -695 +694 @@
          * @see org.greenstone.gatherer.cdm.ArgumentConfiguration
          * @see org.greenstone.gatherer.cdm.Classifier
-         * @see org.greenstone.gatherer.cdm.CustomClassifier
          */
         public void actionPerformed(ActionEvent event) {
@@ -763 +761 @@
          * @see org.greenstone.gatherer.cdm.ArgumentConfiguration
          * @see org.greenstone.gatherer.cdm.Classifier
-         * @see org.greenstone.gatherer.cdm.CustomClassifier
          */
         public void actionPerformed(ActionEvent event) {
@@ -828 +825 @@
     private class RemoveListener
         implements ActionListener {
-                /** Any implementation of <i>ActionListener</i> must include this method so that we can be informed when an action has occured on one of our target controls, so we can remove the selected Classifier.
-                 * @param event An <strong>ActionEvent</strong> containing information garnered from the control action.
-                 * @see org.greenstone.gatherer.cdm.Classifier
-                 * @see org.greenstone.gatherer.cdm.CustomClassifier
-                 */
+        /** Any implementation of <i>ActionListener</i> must include this method so that we can be informed when an action has occured on one of our target controls, so we can remove the selected Classifier.
+         * @param event An <strong>ActionEvent</strong> containing information garnered from the control action.
+         * @see org.greenstone.gatherer.cdm.Classifier
+         */
         public void actionPerformed(ActionEvent event) {
         if(!classifier_list.isSelectionEmpty()) {

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

@@ -200 +200 @@
         ArrayList feature_model = buildFeatureModel();
         part_model = new Vector();
-        part_model.add("");//get("Custom"));
+        part_model.add("");
         part_model.add("DateList");
         part_model.add("HList");
@@ -537 +537 @@
         implements Comparable {
         private Classifier classifier = null;
-        private CustomClassifier custom_classifier = null;
         private String text = null;
         public Entry(Object object) {
@@ -543 +542 @@
             classifier = (Classifier)object;
         }
-        if(object instanceof CustomClassifier) {
-            custom_classifier = (CustomClassifier)object;
-        }
         else if(object instanceof String) {
             text = (String)object;
@@ -580 +576 @@
         return classifier;
         }
-        public CustomClassifier getCustomClassifier() {
-        return custom_classifier;
-        }
         public Object getFeature() {
         if(classifier != null) {
@@ -593 +586 @@
             String name = classifier.toString();
             return name.substring(9);
-        }
-        if(custom_classifier != null) {
-            String name = custom_classifier.toString();
-            return name;//.substring(17);
         }
         return text;