Changeset 7111

Timestamp:

2004-03-23T16:43:46+12:00 (20 years ago)

Author:

kjdon

Message:

modified how the arguments get added to the list when creating a new plugin based on an old one. also arguments keep their original owner now unless they are assigned, so that the configure plugin display looks the same after list regeneration

File:

• trunk/gli/src/org/greenstone/gatherer/cdm/PlugIn.java (modified) (3 diffs)

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

@@ -48 +48 @@
     private String name; // Only for Base
 
-    /** Constructor used in DOMProxyListModel initializations, and Library Level.
+    /** Constructor used in DOMProxyListModel initializations, and Library Level. Used for Base plugins (those in the list of available plugins, not ones that are in the DOMProxyList)
      */
     public PlugIn() {
     }
-
+    
+    /** Constructor used for the plugins that are in the DOMProxyList */
+    // Every time the list of plugins in the assigned plugins box changes, (eg plugin added or removed, not when plugin configured), the plugins seem to be regenerated, using the element from the old plugin. All known args get added to the element the first time this happens - we need to add them to the arguments list in the order they are found in the base plugins though, not this order.
     public PlugIn(Element element, PlugIn base_plugin) {
     super();
@@ -66 +68 @@
         Argument argument = new Argument(option_element);
         //Gatherer.println("Rebuilding existing argument: " + argument.getName());
-        argument.setOwner(name);
-        add(argument);
         known_arguments.put(argument.getName(), argument);
+        if (argument.isAssigned() || base_plugin == null) {
+        // if the arg is assigned, the current plugin now becomes its owner, and we add it to the front of the ArrayList of args. But otherwise, it will retain its old owner, and we will add it in the correct place from the base plugin
+        argument.setOwner(name);
+        add(argument);
+        } 
     }
     // 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.
+        // Copy the details, and add a reference to whatever base_plugins super plugin is. ?? 
         description = base_plugin.getDescription();
         // Now search through the 'dummy' arguments belonging to the base plugin. For each found, if it is already assigned, fill out further details such as type. If any are found that are not already assigned for this plugin, copy them and add them, but without a value.
@@ -94 +99 @@
             existing_argument.setMinimum(base_argument.getMinimum());
             existing_argument.setMaximum(base_argument.getMaximum());
-    
+            if (!existing_argument.isAssigned()) {
+            // here we give it back its original owner and add it to the list. If it is assigned, these two things were done already
+            existing_argument.setOwner(base_argument.getOwner());
+            add(existing_argument); 
+            }
             
         }