Changeset 5207

Timestamp:

2003-08-19T15:32:22+12:00 (21 years ago)

Author:

jmt12

Message:

Fix 203B120, 145 and 146

Location:

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

Files:

• DOMProxyListModel.java (modified) (1 diff)
• PlugIn.java (modified) (9 diffs)
• PlugInManager.java (modified) (12 diffs)

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

@@ -166 +166 @@
     int child_count = children.getLength();
     for(int i = 0; i < child_count; i++) {
-        child_list.add(class_type.create((Element)children.item(i)));
+        child_list.add(getElementAt(i));
     }
     return child_list;

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

@@ -39 +39 @@
     extends ArrayList
     implements ArgumentContainer, Comparable, DOMProxyListEntry, Serializable {
+    private boolean is_abstract = false; // Only for Base
     /** The DOM Element this assigned PlugIn is modelled on. */
     private Element element;
     /** The parent PlugIn this one inherits from, if any. */
-    private PlugIn super_plugin;
-    private String description;
-    private String name;
-
-    /** Constructor used only in DOMProxyListModel initializations.
+    private PlugIn super_plugin; // Only for Base
+    private String description; // Only for Base
+    private String name; // Only for Base
+
+    /** Constructor used in DOMProxyListModel initializations, and Library Level.
      */
     public PlugIn() {
@@ -55 +56 @@
     this.element = element;
     this.name = element.getAttribute(StaticStrings.TYPE_ATTRIBUTE);
-    ///atherer.println("Establishing Plugin: " + name);
+    //Gatherer.println("Establishing Plugin: " + name);
     // Parse in any argument options for this plugin, keeping a list of the ones found
     HashMap known_arguments = new HashMap();
@@ -63 +64 @@
         Element option_element = (Element) option_elements.item(i);
         Argument argument = new Argument(option_element);
-        ///atherer.println("Rebuilding existing argument: " + argument.getName());
+        //Gatherer.println("Rebuilding existing argument: " + argument.getName());
         argument.setOwner(name);
         add(argument);
@@ -70 +71 @@
     // If a base plugin was given
     if(base_plugin != null) {
+        //Gatherer.println("Based on previous plugin.");
         // Copy the details, and add a reference to whatever base_plugins super plugin is.
         description = base_plugin.getDescription();
@@ -78 +80 @@
         Argument base_argument = (Argument) all_arguments.get(j);
         String base_argument_name = base_argument.getName();
-        ///atherer.println("Library indicates this plugin should have an argument: " + base_argument_name);
+        //Gatherer.println("Library indicates this plugin should have an argument: " + base_argument_name);
         Argument existing_argument = (Argument) known_arguments.get(base_argument_name);
         // Found an existing argument. Complete its details
         if(existing_argument != null) {
-            ///atherer.println("Found existing argument. Filling out details.");
+            //Gatherer.println("Found existing argument. Filling out details.");
             existing_argument.setCustomArgument(false);
             existing_argument.setDefaultValue(base_argument.getDefaultValue());
@@ -92 +94 @@
         // No existing argument. Copy base_argument and add it, but do not set its assigned flag. That should be set the first time its changed by the user.
         else {
-            ///atherer.println("No such argument. Adding new, unassigned, argument.");
+            //Gatherer.println("No such argument. Adding new, unassigned, argument.");
             // The trick thing is that we have to create a new element in the DOM as well.
             Argument new_argument = base_argument.copy();
@@ -106 +108 @@
         }
     }
-    }
-
-    /** This constructor is only used for library level Plugins.
-     * @param name
-     * @param description
-     * @param super_plugin
-     */
-    public PlugIn(String name, String description, PlugIn super_plugin) {
-    super();
-    this.description = description;
-    this.name = name;
-    this.super_plugin = super_plugin;
     }
 
@@ -254 +244 @@
     }
     return name;
+    }
+
+    public boolean isAbstract() {
+    return is_abstract;
     }
 
@@ -330 +324 @@
     }
 
+    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/PlugInManager.java

@@ -140 +140 @@
     // Can't ever move RecPlug or ArcPlug.
     if(getSize() < 3) {
-        Gatherer.println("Not enough plugins to allow moving.");
+        //Gatherer.println("Not enough plugins to allow moving.");
         return;
     }
@@ -307 +307 @@
     private Object[] getAvailable() {
     ArrayList available = new ArrayList();
-    available.addAll(library);
+    int library_size = library.size();
+    for(int i = 0; i < library_size; i++) {
+        PlugIn plugin = (PlugIn) library.get(i);
+        if(!plugin.isAbstract()) {
+        available.add(plugin);
+        }
+        plugin = null;
+    }
     // Now go through the assigned plugins, and remove any that match.
     available.removeAll(children());
+    //Gatherer.println("There are a total of " + library.size() + " plugins in the library.");
+    //Gatherer.println("However " + children().size() + " are in use,");
+    //Gatherer.println("So only " + available.size() + " remain.");
     return available.toArray();
     }
@@ -386 +396 @@
         else {
         String plugin_name = getPlugInName(plugin);
-        Gatherer.println("Zero length argument xml detected for: " + plugin_name);
+        //Gatherer.println("Zero length argument xml detected for: " + plugin_name);
         JOptionPane.showMessageDialog(Gatherer.g_man, get("PlugIn_XML_Parse_Failed", plugin_name), get("General.Error"), JOptionPane.ERROR_MESSAGE);
         }
@@ -454 +464 @@
         plugin.setDescription(MSMUtils.getValue(node));
         }
-                // Parse the multitude of arguments.
+        else if(node_name.equals(CollectionConfiguration.ABSTRACT_ELEMENT)) {
+        plugin.setIsAbstract(MSMUtils.getValue(node).equalsIgnoreCase(CollectionConfiguration.YES_STR));
+        }
+        // Parse the multitude of arguments.
         else if(node_name.equals("Arguments")) {
         for(Node arg = node.getFirstChild(); arg != null; arg = arg.getNextSibling()) {
@@ -566 +579 @@
      */
     public PlugInControl() {
-        Object plugins[] = library.toArray();
-        Vector plugin_model = new Vector();
-        for(int i = 0; i < plugins.length; i++) {
-        plugin_model.add(((PlugIn)plugins[i]).getName());
-        }
-        Collections.sort(plugin_model);
         // Create
         add = new JButton(get("Add"));
@@ -670 +677 @@
         plugin_list_label.setBorder(BorderFactory.createEmptyBorder(0,2,0,2));
 
+        movement_pane.setBorder(BorderFactory.createEmptyBorder(0,2,0,0));
         movement_pane.setLayout(new GridLayout(4,1));
         movement_pane.add(move_top);
@@ -704 +712 @@
         central_pane.add(temp, BorderLayout.SOUTH);
 
-        button_pane.setLayout(new GridLayout(3,1));
+        button_pane.setLayout(new GridLayout(1,3));
         button_pane.add(add);
         button_pane.add(configure);
@@ -741 +749 @@
         public void actionPerformed(ActionEvent event) {
         Object selected_object = plugin.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 && plugin.getSelectedIndex() == -1) {
-            plugin.insertItemAt(selected_object, plugin.getItemCount());
-        }
         if(selected_object != null) {
+            // Retrieve the base plugin if any
+            PlugIn base_plugin = getBasePlugIn(selected_object.toString());
+
             // Create a new element in the DOM
             Element element = CollectionDesignManager.collect_config.document.createElement(CollectionConfiguration.PLUGIN_ELEMENT);
             // Remember that the plugin supplied might be a custom string rather than a base plugin
             PlugIn new_plugin = null;
-            if(selected_object instanceof PlugIn) {
-            PlugIn base_plugin = (PlugIn) selected_object;
+            if(base_plugin != null) {
+            //Gatherer.println("New PlugIn based on existing PlugIn");
             element.setAttribute(CollectionConfiguration.TYPE_ATTRIBUTE, base_plugin.getName());
             new_plugin = new PlugIn(element, base_plugin);
-            base_plugin = null;
             }
             else {
+            //Gatherer.println("New Custom PlugIn");
             element.setAttribute(CollectionConfiguration.TYPE_ATTRIBUTE, selected_object.toString());
             new_plugin = new PlugIn(element, null);
@@ -766 +773 @@
                 assignPlugIn(new_plugin);
                 plugin_list.setSelectedValue(new_plugin, true);
+                // Since we weren't cancelled, and if there was a base plugin, ensure it no longer is shown as available
+                if(base_plugin != null) {
+                plugin.removeItem(base_plugin);
+                }
             }
             ac = null;
@@ -774 +785 @@
             JOptionPane.showMessageDialog(Gatherer.g_man, get("PlugIn_Exists"), get("General.Error"), JOptionPane.ERROR_MESSAGE);
             }
+            base_plugin = null;
         }
         }
@@ -900 +912 @@
     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.
-                 * @param event An <strong>ActionEvent</strong> containing information garnered from the control action.
-                 */
+        /** 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.
+         * @param event An <strong>ActionEvent</strong> containing information garnered from the control action.
+         */
         public void actionPerformed(ActionEvent event) {
         if(!plugin_list.isSelectionEmpty()) {
@@ -911 +923 @@
             }
             }
-            //Object object = plugin_list.getSelectedValue();
-            //if(object instanceof PlugIn) {
-            //removePlugIn((PlugIn)object);
-            //}
-        }
+            // Refresh the available plugins
+            plugin.setModel(new DefaultComboBoxModel(getAvailable()));
+        }
+        remove.setEnabled(false);
         }
     }