Changeset 9645

Timestamp:

2005-04-12T11:20:28+12:00 (19 years ago)

Author:

kjdon

Message:

assigned options previously sometimes went to the top of the list, sometimes they didn't and it was a bit confusing, so all options now belong to their original plugin owner, and stay at teh same place in the list

File:

• trunk/gli/src/org/greenstone/gatherer/cdm/Plugin.java (modified) (2 diffs)

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

@@ -67 +67 @@
         //DebugStream.println("Rebuilding existing argument: " + argument.getName());
         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
+        if (base_plugin == null) {
+        // otherwise they will all be added in the next step
         argument.setOwner(name);
         add(argument);
@@ -97 +97 @@
             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); 
-            }
+            existing_argument.setOwner(base_argument.getOwner());
+            add(existing_argument); 
             
         }