Changeset 4366

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

-              r4293
+              r4366
 public class Argument
      implements Comparable, Serializable {
      /** If this argument has multiple values, then they are stored here. This was originally a Hashtable, but since the synchronization overhead is unwarrented it was changed to a HashMap. */
      private ArrayList values = null;
      /** <i>true</i> if this argument is required for the applicable script to work properly, <i>false</i> otherwise. */
      private boolean required = false;
      /** The type of this argument. Initially an int, but bytes are cheaper. */
      private byte type = FLAG;
      /** If the argument is of type ENUM then this map holds all the various options. Each entry is an &lt;option value&gt; -&gt; &lt;description&gt; mapping. */
      private HashMap list = null;
      /** A default value for parameter-type arguments. May be a Perl pattern. */
      private String default_value = null;
      /** The text description of this argument parsed from the pluginfo output. */
      private String desc = null;
      /** The argument flag as it appears in the command. Also used as the unique identifier of an argument. */
      private String name = null;
      /** The plugin that owns this argument, for the purposes of visualising inheritance. */
      private String owner = null;
      /** If this argument has been assigned, what is its value. Must be non-null for the argument to be printed. */
      private String value = null;
      /** An element of the argument type enumeration. */
      static final public byte ENUM = 0;
      /** An element of the argument type enumeration. */
      static final public byte FLAG = 1;
      /** An element of the argument type enumeration. */
      static final public byte HIERARCHY = 2;
      /** An element of the argument type enumeration. */
      static final public byte INTEGER = 3;
      /** An element of the argument type enumeration. */
      static final public byte LANGUAGE = 4;
      /** An element of the argument type enumeration. */
      static final public byte METADATA = 5;
      /** An element of the argument type enumeration. */
      static final public byte METADATUM = 6;
      /** An element of the argument type enumeration. */
      static final public byte STRING = 7;
      /** Default Constructor. */
      public Argument() {
+     }
      /** Normal Constructor, based on data parsed from an information script.
+    implements Comparable, Serializable {
+    /** If this argument has multiple values, then they are stored here. This was originally a Hashtable, but since the synchronization overhead is unwarrented it was changed to a HashMap. */
+    private ArrayList values = null;
+    /** <i>true</i> if this argument is required for the applicable script to work properly, <i>false</i> otherwise. */
+    private boolean required = false;
+    /** The type of this argument. Initially an int, but bytes are cheaper. */
+    private byte type = FLAG;
+    /** If the argument is of type ENUM then this map holds all the various options. Each entry is an &lt;option value&gt; -&gt; &lt;description&gt; mapping. */
+    private HashMap list = null;
+    /** A default value for parameter-type arguments. May be a Perl pattern. */
+    private String default_value = null;
+    /** The text description of this argument parsed from the pluginfo output. */
+    private String desc = null;
+    /** The argument flag as it appears in the command. Also used as the unique identifier of an argument. */
+    private String name = null;
+    /** The plugin that owns this argument, for the purposes of visualising inheritance. */
+    private String owner = null;
+    /** If this argument has been assigned, what is its value. Must be non-null for the argument to be printed. */
+    private String value = null;
+    /** An element of the argument type enumeration. */
+    static final public byte ENUM = 0;
+    /** An element of the argument type enumeration. */
+    static final public byte FLAG = 1;
+    /** An element of the argument type enumeration. */
+    static final public byte HIERARCHY = 2;
+    /** An element of the argument type enumeration. */
+    static final public byte INTEGER = 3;
+    /** An element of the argument type enumeration. */
+    static final public byte LANGUAGE = 4;
+    /** An element of the argument type enumeration. */
+    static final public byte METADATA = 5;
+    /** An element of the argument type enumeration. */
+    static final public byte METADATUM = 6;
+    /** An element of the argument type enumeration. */
+    static final public byte STRING = 7;
+    /** Default Constructor. */
+    public Argument() {
+    }
+    /** Normal Constructor, based on data parsed from an information script.
       * @param name The argument flag as it appears in the command, as a <strong>String</strong>. Also used as the unique identifier of an argument.
       * @param desc The text description of this argument parsed from the output as a <strong>String</strong>.
 …
       * @param default_value The default value for a parameter type argument, which may include a Perl type regular expression, as a <strong>String</strong>.
       */
      public Argument(String name, String desc, byte type, String default_value) {
           this.default_value = default_value;
           this.desc = desc;
           this.name = name;
           this.type = type;
           if(type == ENUM) {
                 this.list = new HashMap();
+          }
           if(type == METADATUM) {
                 values = new ArrayList();
+          }
+     }
      /** Method to add an element to the option list.
+    public Argument(String name, String desc, byte type, String default_value) {
+    this.default_value = default_value;
+    this.desc = desc;
+    this.name = name;
+    this.type = type;
+    if(type == ENUM) {
+        this.list = new HashMap();
+    }
+    if(type == METADATUM) {
+        values = new ArrayList();
+    }
+    }
+    /** Method to add an element to the option list.
       * @param name The name value of the option as a <strong>String</strong>.
       * @param desc The description of this options as a <strong>String</strong>.
       */
      public void addOption(String name, String desc) {
           if(type == ENUM && name != null) {
                 if(desc == null) {
                      desc = "";
+                }
                 if(!list.containsKey(name)) {
                      list.put(name, desc);
+                }
+          }
+     }
      /** Method to compare two arguments for ordering.
+    public void addOption(String name, String desc) {
+    if(type == ENUM && name != null) {
+        if(desc == null) {
+        desc = "";
+        }
+        if(!list.containsKey(name)) {
+        list.put(name, desc);
+        }
+    }
+    }
+    /** Method to compare two arguments for ordering.
       * @param object The argument we are comparing to, as an <strong>Object</strong>.
       * @return An <i>int</i> specifying the argument order, using values as set out in String.
 …
       * @see org.greenstone.gatherer.cdm.Argument
       */
      public int compareTo(Object object) {
           Argument argument = (Argument)object;
           return getName().compareTo(argument.getName());
+     }
      /** Method to deep copy this argument.
+    public int compareTo(Object object) {
+    Argument argument = (Argument)object;
+    return getName().compareTo(argument.getName());
+    }
+    /** Method to deep copy this argument.
       * @return A newly created <strong>Argument</strong> which has the same details as this one.
       */
      public Argument copy() {
           Argument copy = new Argument(name, desc, type, default_value);
           copy.setRequired(required);
           if(values != null) {
                 copy.setValues(values);
+          }
           if(list != null) {
                 HashMap list_deep_copy = new HashMap();
                 Iterator it = list.keySet().iterator();
                 while(it.hasNext()) {
                      String key = (String) it.next();
                      String desc = (String) list.get(key);
                      list_deep_copy.put(new String(key), new String(desc));
+                }
                 copy.setOptions(list_deep_copy);
+          }
           return copy;
+     }
      /** Method to determine if two arguments are equal.
+    public Argument copy() {
+    Argument copy = new Argument(name, desc, type, default_value);
+    copy.setRequired(required);
+    if(values != null) {
+        copy.setValues(values);
+    }
+    if(list != null) {
+        HashMap list_deep_copy = new HashMap();
+        Iterator it = list.keySet().iterator();
+        while(it.hasNext()) {
+        String key = (String) it.next();
+        String desc = (String) list.get(key);
+        list_deep_copy.put(new String(key), new String(desc));
+        }
+        copy.setOptions(list_deep_copy);
+    }
+    return copy;
+    }
+    /** Method to determine if two arguments are equal.
       * @param object The argument to test against, as an <strong>Object</strong>.
       * @return <i>true</i> if the arguments names match, <i>false</i> otherwise.
       */
      public boolean equals(Object object) {
           return (compareTo(object) == 0);
+     }
      /** Method to retrieve the value of default_value.
+    public boolean equals(Object object) {
+    return (compareTo(object) == 0);
+    }
+    /** Method to retrieve the value of default_value.
       * @return A <strong>String</strong> containing the default value.
       */
      public String getDefaultValue() {
           return default_value;
+     }
      /** Method to retrieve this arguments description.
+    public String getDefaultValue() {
+    return default_value;
+    }
+    /** Method to retrieve this arguments description.
       * @return A <strong>String</strong> containing the description.
       */
      public String getDesc() {
           return desc;
+     }
      /** Method to retrieve the description of a certain list option value.
+    public String getDesc() {
+    return desc;
+    }
+    /** Method to retrieve the description of a certain list option value.
       * @param key The <strong>String</strong> whose description we are searching for.
       * @return The description of the desired key as a <strong>String</strong> which may be empty if no such key exists.
       */
      public String getDesc(String key) {
           if(list.containsKey(key)) {
                 return (String)list.get(key);
+          }
           return "";
+     }
      /** Method to retrieve the option list for this argument.
+    public String getDesc(String key) {
+    if(list.containsKey(key)) {
+        return (String)list.get(key);
+    }
+    return "";
+    }
+    /** Method to retrieve the option list for this argument.
       * @return A <strong>HashMap</strong> containing &lt;option value&gt; -&gt; &lt;description&gt; entries.
       */
      public HashMap getList() {
           return list;
+     }
      /** Method to retrieve the value of name.
+    public HashMap getList() {
+    return list;
+    }
+    /** Method to retrieve the value of name.
       * @return A <strong>String</strong> containing the argument name.
       */
      public String getName() {
           return name;
+     }
      /** Retrieve the name of the owner of this argument.
+    public String getName() {
+    return name;
+    }
+    /** Retrieve the name of the owner of this argument.
       * @return The owners name as a <strong>String</strong>.
       */
      public String getOwner() {
           return owner;
+     }
      /** Method to determine the type of this argument.
+    public String getOwner() {
+    return owner;
+    }
+    /** Method to determine the type of this argument.
       * @return An <i>byte</i> specifying the type.
       */
      public byte getType() {
           return type;
+     }
      /** Method to retrieve the value of value.
+    public byte getType() {
+    return type;
+    }
+    /** Method to retrieve the value of value.
       * @return The value of value as a <strong>String</strong>.
       */
      public String getValue() {
           return value;
+     }
      /** Retrieve the vector of values.
+    public String getValue() {
+    return value;
+    }
+    /** Retrieve the vector of values.
       * @return An <strong>ArrayList</strong> of values.
       */
      public ArrayList getValues() {
           return values;
+     }
      /** Method to determine if this argument has been assigned.
+    public ArrayList getValues() {
+    return values;
+    }
+    /** Method to determine if this argument has been assigned.
       * @return <i>true</i> if it has, <i>false</i> otherwise.
       */
      public boolean isAssigned() {
           return (required || value != null || (values != null && values.size() > 0));
+     }
      /** Method to determine of this argument is required for the associated script to work.
+    public boolean isAssigned() {
+    return (required || value != null || (values != null && values.size() > 0));
+    }
+    /** Method to determine of this argument is required for the associated script to work.
       * @return <i>true</i> if this argument is required, <i>false</i> otherwise.
       */
      public boolean isRequired() {
           return required;
+     }
      /** Method to allow for the activation of arguments that might never have their setValue() method called.
+    public boolean isRequired() {
+    return required;
+    }
+    /** Method to allow for the activation of arguments that might never have their setValue() method called.
       * @param new_state The required state as a <i>boolean</i>.
       */
      public void setAssigned(boolean new_state) {
           if(new_state && (value == null || values == null)) {
                 value = "";
+          }
           else {
                 value = null;
+          }
+     }
      /** Sets the value of default_value.
+    public void setAssigned(boolean new_state) {
+    if(new_state && (value == null || values == null)) {
+        value = "";
+    }
+    else {
+        value = null;
+    }
+    }
+    /** Sets the value of default_value.
       * @param new_default_value The new value for default_value as a <strong>String</strong>.
       */
      public void setDefault(String new_default_value) {
           default_value = new_default_value;
+     }
      /** Set the value of desc.
+    public void setDefault(String new_default_value) {
+    default_value = new_default_value;
+    }
+    /** Set the value of desc.
       * @param new_desc The new value of desc as a <strong>String</strong>.
       */
      public void setDesc(String new_desc) {
           desc = new_desc;
+     }
      /** Set the value of name.
+    public void setDesc(String new_desc) {
+    desc = new_desc;
+    }
+    /** Set the value of name.
       * @param new_name The new value of name as a <strong>String</strong>.
       */
      public void setName(String new_name) {
           name = new_name;
+     }
      /** Sets the value of the options list.
+    public void setName(String new_name) {
+    name = new_name;
+    }
+    /** Sets the value of the options list.
       * @param new_list The new options list as a <strong>HashMap</strong>.
       */
      public void setOptions(HashMap new_list) {
           list = new_list;
+     }
      /** Set the owner of this argument.
+    public void setOptions(HashMap new_list) {
+    list = new_list;
+    }
+    /** Set the owner of this argument.
       * @param owner The name of the owner of this argument as a <strong>String</strong>.
       */
      public void setOwner(String owner) {
           this.owner = owner;
+     }
      /** Set the value of required.
+    public void setOwner(String owner) {
+    this.owner = owner;
+    }
+    /** Set the value of required.
       * @param new_required The new value of required as a <i>boolean</i>.
       */
      public void setRequired(boolean new_required) {
           required = new_required;
+     }
      /** Set the value of type.
+    public void setRequired(boolean new_required) {
+    required = new_required;
+    }
+    /** Set the value of type.
       * @param new_type The new value of type as an <i>byte</i>.
       */
      public void setType(byte new_type) {
           type = new_type;
           if(type == ENUM) {
                 list = new HashMap();
+          }
           if(type == METADATUM && values == null) {
                 values = new ArrayList();
+          }
+     }
      /** Set the value of type, by matching a type to the given string.
+    public void setType(byte new_type) {
+    type = new_type;
+    if(type == ENUM) {
+        list = new HashMap();
+    }
+    if(type == METADATUM && values == null) {
+        values = new ArrayList();
+    }
+    }
+    /** Set the value of type, by matching a type to the given string.
       * @param new_type A <strong>String</strong> which contains the name of a certain argument type.
       */
      public void setType(String new_type) {
           if(new_type.equalsIgnoreCase("enum")) {
                 this.type = ENUM;
                 list = new HashMap();
+          }
           else if(new_type.equalsIgnoreCase("flag")) {
                 this.type = FLAG;
+          }
           else if(new_type.equalsIgnoreCase("hierarchy")) {
                 this.type = HIERARCHY;
+          }
           else if(new_type.equalsIgnoreCase("int")) {
                 this.type = INTEGER;
+          }
           else if(new_type.equalsIgnoreCase("language")) {
                 this.type = LANGUAGE;
+          }
           else if(new_type.equalsIgnoreCase("metadata")) {
                 this.type = METADATA;
+          }
           else if(new_type.equalsIgnoreCase("metadatum")) {
                 this.type = METADATUM;
                 if(values == null) {
                      values = new ArrayList();
+                }
+          }
           else if(new_type.equalsIgnoreCase("string")) {
                 this.type = STRING;
+          }
+     }
      /** Method to set the value of value.
+    public void setType(String new_type) {
+    if(new_type.equalsIgnoreCase("enum")) {
+        this.type = ENUM;
+        list = new HashMap();
+    }
+    else if(new_type.equalsIgnoreCase("flag")) {
+        this.type = FLAG;
+    }
+    else if(new_type.equalsIgnoreCase("hierarchy")) {
+        this.type = HIERARCHY;
+    }
+    else if(new_type.equalsIgnoreCase("int")) {
+        this.type = INTEGER;
+    }
+    else if(new_type.equalsIgnoreCase("language")) {
+        this.type = LANGUAGE;
+    }
+    else if(new_type.equalsIgnoreCase("metadata")) {
+        this.type = METADATA;
+    }
+    else if(new_type.equalsIgnoreCase("metadatum")) {
+        this.type = METADATUM;
+        if(values == null) {
+        values = new ArrayList();
+        }
+    }
+    else if(new_type.equalsIgnoreCase("string")) {
+        this.type = STRING;
+    }
+    }
+    /** Method to set the value of value.
       * @param new_value The new value of value as a <strong>String</strong>.
       */
      public void setValue(String new_value) {
           this.value = new_value;
+     }
      /** Set the values vector to the given values. Currently I just assign the new values, whereas I may later want to implement a deep clone.
+    public void setValue(String new_value) {
+    this.value = new_value;
+    }
+    /** Set the values vector to the given values. Currently I just assign the new values, whereas I may later want to implement a deep clone.
       * @param new_values An <strong>ArrayList</strong> of values.
       */
      public void setValues(ArrayList new_values) {
           values = new_values;
+     }
      /** Method for translating the data of this class into a string.
+    public void setValues(ArrayList new_values) {
+    values = new_values;
+    }
+    /** Method for translating the data of this class into a string.
       * @return A <strong>String</strong> containing a fragment of the total arguments string.
       */
      public String toString() {
           switch(type) {
           case FLAG:
                 return "-" + name;
           case METADATUM:
                 String text = "-" + name + " ";
                 for(int i = 0; i < values.size(); i++) {
                      text = text + values.get(i).toString();
                      if(i < values.size() - 1) {
                           text = text + ",";
+                     }
+                }
                 return text;
           default:
                 return "-" + name + " " + value;
+          }
+     }
+    public String toString() {
+    switch(type) {
+    case FLAG:
+        return "-" + name;
+    case METADATUM:
+        String text = "-" + name + " ";
+        for(int i = 0; i < values.size(); i++) {
+        text = text + values.get(i).toString();
+        if(i < values.size() - 1) {
+            text = text + ",";
+        }
+        }
+        return text;
+    default:
+        return "-" + name + " " + value;
+    }
+    }
+}

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

-              r4293
+              r4366
 public class ArgumentConfiguration
      extends JDialog
      implements ActionListener {
      /** The data whose arguments we are editing. */
      private ArgumentContainer data = null;
      /** Argument these argument controls coloured or uncoloured (alternates to indicate inheritance). */
      private boolean coloured = false;
      /** Whether we have successfully edited the arguments associated with the ArgumentContainer or if we have failed to enter required arguments and have instead cancelled (which would cause argument additions to roll back). */
      private boolean success = false;
      /** A reference to the main CollectionDesignManager class for access to other managers. */
      private CollectionDesignManager manager = null;
      /** A reference to the Gatherer. */
      private Gatherer gatherer = null;
      /** A button to cancel this dialog. */
      private JButton cancel = null;
      /** A button to accept the changes and close the dialog. */
      private JButton ok = null;
      /** A reference to the ourselves so our inner classes can dispose us like a dialog. */
      private ArgumentConfiguration self = null;
      /** The central pane where a list of known arguments is displayed. */
      private JPanel central_pane = null;
      /** The field for entering custom arguments. */
      private JTextField custom = null;
      /** The name of the owner of the last argument control. */
      private String previous_owner = null;
      /** The size used for an argument label. */
      static final private Dimension LABEL_SIZE = new Dimension(225, 25);
      /** Size of a list. */
      static final private Dimension LIST_SIZE = new Dimension(380, 50);
      /** The size used for the dialog. */
      static final private Dimension SIZE = new Dimension(800, 400);
      /** Constructor.
       * @param gatherer A reference to the <strong>Gatherer</strong>.
       * @param manager The <strong>CollectionDesignManager</strong> for access to other configuration managers.
       * @param data The plugin or classifier whose arguments we are configuring, in the form of its supported <strong>ArgumentContainer</strong> interface.
       * @see org.greenstone.gatherer.Configuration
       */
      public ArgumentConfiguration(Gatherer gatherer, CollectionDesignManager manager, ArgumentContainer data) {
           super(gatherer.g_man);
           this.data = data;
           this.gatherer = gatherer;
           this.manager = manager;
           this.self = this;
           String custom_str = data.getCustom();
           // Create
           setModal(true);
           setSize(SIZE);
           setTitle(get("Title"));
           JPanel button_pane = new JPanel();
           cancel = new JButton(get("General.Cancel"));
           cancel.setMnemonic(KeyEvent.VK_C);
           central_pane = new JPanel();
           JPanel content_pane = (JPanel) getContentPane();
           if(custom_str != null) {
                 custom = new JTextField(custom_str);
+          }
           else {
                 custom = new JTextField();
+          }
           JLabel custom_label = new JLabel(get("Custom"));
           custom_label.setPreferredSize(LABEL_SIZE);
           JPanel custom_pane = new JPanel();
           String args[] = new String[1];
           args[0] = data.getName();
           JLabel header = new JLabel(get("Header",args));
           args = null;
           header.setHorizontalAlignment(JLabel.CENTER);
           header.setOpaque(true);
           JPanel header_pane = new JPanel();
           ok = new JButton(get("General.OK"));
           ok.setMnemonic(KeyEvent.VK_O);
           // Listeners
           cancel.addActionListener(this);
           ok.addActionListener(this);
           // Layout
           custom_pane.setLayout(new BorderLayout());
           custom_pane.add(custom_label, BorderLayout.WEST);
           custom_pane.add(custom, BorderLayout.CENTER);
           header_pane.setBorder(BorderFactory.createEmptyBorder(0,0,5,0));
           header_pane.setLayout(new BorderLayout());
           header_pane.add(header, BorderLayout.NORTH);
           header_pane.add(custom_pane, BorderLayout.CENTER);
           button_pane.setBorder(BorderFactory.createEmptyBorder(5,0,0,0));
           button_pane.setLayout(new GridLayout(1,2));
           button_pane.add(ok);
           button_pane.add(cancel);
           central_pane.setBorder(BorderFactory.createEmptyBorder(5,5,5,5));
           central_pane.setLayout(new BoxLayout(central_pane, BoxLayout.Y_AXIS));
           content_pane.setBorder(BorderFactory.createEmptyBorder(5,5,5,5));
           content_pane.setLayout(new BorderLayout());
           content_pane.add(header_pane, BorderLayout.NORTH);
           content_pane.add(new JScrollPane(central_pane), BorderLayout.CENTER);
           content_pane.add(button_pane, BorderLayout.SOUTH);
           // Now generate a set of controls for each of the arguments.
           generateControls();
           // Display on screen.
           Dimension screen_size = gatherer.config.screen_size;
           setLocation((screen_size.width - SIZE.width) / 2, (screen_size.height - SIZE.height) / 2);
           screen_size = null;
+     }
      /** Any implementation of ActionListener must include this method so that we can be informed when an action has occured on one of the controls we are listening to.
+    extends JDialog
+    implements ActionListener {
+    /** The data whose arguments we are editing. */
+    private ArgumentContainer data = null;
+    /** Argument these argument controls coloured or uncoloured (alternates to indicate inheritance). */
+    private boolean coloured = false;
+    /** Whether we have successfully edited the arguments associated with the ArgumentContainer or if we have failed to enter required arguments and have instead cancelled (which would cause argument additions to roll back). */
+    private boolean success = false;
+    /** A reference to the main CollectionDesignManager class for access to other managers. */
+    private CollectionDesignManager manager = null;
+    /** A reference to the Gatherer. */
+    private Gatherer gatherer = null;
+    /** A button to cancel this dialog. */
+    private JButton cancel = null;
+    /** A button to accept the changes and close the dialog. */
+    private JButton ok = null;
+    /** A reference to the ourselves so our inner classes can dispose us like a dialog. */
+    private ArgumentConfiguration self = null;
+    /** The central pane where a list of known arguments is displayed. */
+    private JPanel central_pane = null;
+    /** The field for entering custom arguments. */
+    private JTextField custom = null;
+    /** The name of the owner of the last argument control. */
+    private String previous_owner = null;
+    /** The size used for an argument label. */
+    static final private Dimension LABEL_SIZE = new Dimension(225, 25);
+    /** Size of a list. */
+    static final private Dimension LIST_SIZE = new Dimension(380, 50);
+    /** The size used for the dialog. */
+    static final private Dimension SIZE = new Dimension(800, 400);
+    /** Constructor.
+     * @param gatherer A reference to the <strong>Gatherer</strong>.
+     * @param manager The <strong>CollectionDesignManager</strong> for access to other configuration managers.
+     * @param data The plugin or classifier whose arguments we are configuring, in the form of its supported <strong>ArgumentContainer</strong> interface.
+     * @see org.greenstone.gatherer.Configuration
+     */
+    public ArgumentConfiguration(Gatherer gatherer, CollectionDesignManager manager, ArgumentContainer data) {
+    super(gatherer.g_man);
+    this.data = data;
+    this.gatherer = gatherer;
+    this.manager = manager;
+    this.self = this;
+    String custom_str = data.getCustom();
+    // Create
+    setModal(true);
+    setSize(SIZE);
+    setTitle(get("Title"));
+    JPanel button_pane = new JPanel();
+    cancel = new JButton(get("General.Cancel"));
+    cancel.setMnemonic(KeyEvent.VK_C);
+    central_pane = new JPanel();
+    JPanel content_pane = (JPanel) getContentPane();
+    if(custom_str != null) {
+        custom = new JTextField(custom_str);
+    }
+    else {
+        custom = new JTextField();
+    }
+    JLabel custom_label = new JLabel(get("Custom"));
+    custom_label.setPreferredSize(LABEL_SIZE);
+    JPanel custom_pane = new JPanel();
+    String args[] = new String[1];
+    args[0] = data.getName();
+    JLabel header = new JLabel(get("Header",args));
+    args = null;
+    header.setHorizontalAlignment(JLabel.CENTER);
+    header.setOpaque(true);
+    JPanel header_pane = new JPanel();
+    ok = new JButton(get("General.OK"));
+    ok.setMnemonic(KeyEvent.VK_O);
+    // Listeners
+    cancel.addActionListener(this);
+    ok.addActionListener(this);
+    // Layout
+    custom_pane.setLayout(new BorderLayout());
+    custom_pane.add(custom_label, BorderLayout.WEST);
+    custom_pane.add(custom, BorderLayout.CENTER);
+    header_pane.setBorder(BorderFactory.createEmptyBorder(0,0,5,0));
+    header_pane.setLayout(new BorderLayout());
+    header_pane.add(header, BorderLayout.NORTH);
+    header_pane.add(custom_pane, BorderLayout.CENTER);
+    button_pane.setBorder(BorderFactory.createEmptyBorder(5,0,0,0));
+    button_pane.setLayout(new GridLayout(1,2));
+    button_pane.add(ok);
+    button_pane.add(cancel);
+    central_pane.setBorder(BorderFactory.createEmptyBorder(5,5,5,5));
+    central_pane.setLayout(new BoxLayout(central_pane, BoxLayout.Y_AXIS));
+    content_pane.setBorder(BorderFactory.createEmptyBorder(5,5,5,5));
+    content_pane.setLayout(new BorderLayout());
+    content_pane.add(header_pane, BorderLayout.NORTH);
+    content_pane.add(new JScrollPane(central_pane), BorderLayout.CENTER);
+    content_pane.add(button_pane, BorderLayout.SOUTH);
+    // Now generate a set of controls for each of the arguments.
+    generateControls();
+    // Display on screen.
+    Dimension screen_size = gatherer.config.screen_size;
+    setLocation((screen_size.width - SIZE.width) / 2, (screen_size.height - SIZE.height) / 2);
+    screen_size = null;
+    }
+    /** Any implementation of ActionListener must include this method so that we can be informed when an action has occured on one of the controls we are listening to.
       * @param event An <strong>ActionEvent</strong> containing pertinant information about the event that fired this call.
       * @see org.greenstone.gatherer.cdm.ArgumentConfiguration.ArgumentControl
       * @see org.greenstone.gatherer.cdm.ArgumentContainer
       */
      public void actionPerformed(ActionEvent event) {
           boolean cont = true;
           if(event.getSource() == ok) {
+    public void actionPerformed(ActionEvent event) {
+    boolean cont = true;
+    if(event.getSource() == ok) {
                 // Update the details stored in the data objects arguments.
                 if(custom.getText().length() > 0) {
                      data.setCustom(custom.getText());
+                }
+        if(custom.getText().length() > 0) {
+        data.setCustom(custom.getText());
+        }
                 // Loop through each of the controls in the central pane, updating the matching argument as necessary.
                 for(int i = 0; i < central_pane.getComponentCount(); i++) {
                      Component component = central_pane.getComponent(i);
                      if(component instanceof ArgumentControl) {
                           // Once cont goes false it stays false
                           cont = cont && ((ArgumentControl)component).updateArgument();
+                     }
+                }
                 if(cont) {
                      success = true;
+                }
+          }
           if(cont) {
                 dispose();
+          }
+     }
      /** Destructor. */
      public void destroy() {
           cancel = null;
           central_pane = null;
           custom = null;
           data = null;
           gatherer = null;
           manager = null;
           ok = null;
           self = null;
+     }
      /** Method which actually forces the dialog to be shown on screen.
+        for(int i = 0; i < central_pane.getComponentCount(); i++) {
+        Component component = central_pane.getComponent(i);
+        if(component instanceof ArgumentControl) {
+            // Once cont goes false it stays false
+            cont = cont && ((ArgumentControl)component).updateArgument();
+        }
+        }
+        if(cont) {
+        success = true;
+        }
+    }
+    if(cont) {
+        dispose();
+    }
+    }
+    /** Destructor. */
+    public void destroy() {
+    cancel = null;
+    central_pane = null;
+    custom = null;
+    data = null;
+    gatherer = null;
+    manager = null;
+    ok = null;
+    self = null;
+    }
+    /** Method which actually forces the dialog to be shown on screen.
       * @return <i>true</i> if the user completed configuration and pressed ok, <i>false</i> otherwise.
       */
      public boolean display() {
           show();
           return success;
+     }
      private void addHeader(String name, Color color) {
           JPanel header = new JPanel();
           header.setBackground(color);
           JPanel inner_pane = new JPanel();
           inner_pane.setBorder(BorderFactory.createCompoundBorder(BorderFactory.createEmptyBorder(5,5,5,5), BorderFactory.createRaisedBevelBorder()));
           inner_pane.setBackground(color);
           JLabel header_label = new JLabel("<html><strong>" + name + "</strong></html>");
           header_label.setBackground(Gatherer.config.getColor("coloring.collection_heading_background", false));
           header_label.setHorizontalAlignment(JLabel.CENTER);
           header_label.setOpaque(true);
           // Layout.
           inner_pane.setLayout(new BorderLayout());
           inner_pane.add(header_label, BorderLayout.CENTER);
           header.setLayout(new BorderLayout());
           header.add(inner_pane, BorderLayout.CENTER);
           central_pane.add(header);
+     }
      /** Method to iterate through the arguments associated with whatever argument container we are building an argument control view for, creating the appropriate controls for each.
+    public boolean display() {
+    show();
+    return success;
+    }
+    private void addHeader(String name, Color color) {
+    JPanel header = new JPanel();
+    header.setBackground(color);
+    JPanel inner_pane = new JPanel();
+    inner_pane.setBorder(BorderFactory.createCompoundBorder(BorderFactory.createEmptyBorder(5,5,5,5), BorderFactory.createRaisedBevelBorder()));
+    inner_pane.setBackground(color);
+    JLabel header_label = new JLabel("<html><strong>" + name + "</strong></html>");
+    header_label.setBackground(Gatherer.config.getColor("coloring.collection_heading_background", false));
+    header_label.setHorizontalAlignment(JLabel.CENTER);
+    header_label.setOpaque(true);
+    // Layout.
+    inner_pane.setLayout(new BorderLayout());
+    inner_pane.add(header_label, BorderLayout.CENTER);
+    header.setLayout(new BorderLayout());
+    header.add(inner_pane, BorderLayout.CENTER);
+    central_pane.add(header);
+    }
+    /** Method to iterate through the arguments associated with whatever argument container we are building an argument control view for, creating the appropriate controls for each.
       * @see org.greenstone.gatherer.cdm.Argument
       * @see org.greenstone.gatherer.cdm.ArgumentConfiguration.ArgumentControl
       */
      private void generateControls() {
           ArrayList arguments = data.getArguments();
           int total_height = 250;
           int size = arguments.size();
           for(int i = 0; i < size; i++) {
                 Argument argument = (Argument) arguments.get(i);
                 ArgumentControl argument_control = new ArgumentControl(argument);
                 total_height = total_height - argument_control.getPreferredSize().height;
                 central_pane.add(argument_control);
+          }
           if(total_height > 0) {
                 JPanel filler = new JPanel();
                 filler.setPreferredSize(new Dimension(100, total_height));
                 filler.setSize(new Dimension(100, total_height));
                 central_pane.add(filler);
+          }
+     }
      /** Method to retrieve a phrase from the dictionary based on a key.
+    private void generateControls() {
+    ArrayList arguments = data.getArguments();
+    int total_height = 250;
+    int size = arguments.size();
+    for(int i = 0; i < size; i++) {
+        Argument argument = (Argument) arguments.get(i);
+        ArgumentControl argument_control = new ArgumentControl(argument);
+        total_height = total_height - argument_control.getPreferredSize().height;
+        central_pane.add(argument_control);
+    }
+    if(total_height > 0) {
+        JPanel filler = new JPanel();
+        filler.setPreferredSize(new Dimension(100, total_height));
+        filler.setSize(new Dimension(100, total_height));
+        central_pane.add(filler);
+    }
+    }
+    /** Method to retrieve a phrase from the dictionary based on a key.
       * @param key A <strong>String</strong> used to find the correct phrase.
       * @param args A <strong>String[]</strong> of arguments used in formatting and filling out the phrase.
       * @return A <strong>String</strong> containing the correct phrase with the correct formatting.
       */
      private String get(String key) {
           return get(key, null);
+     }
      /** Method to retrieve a phrase from the dictionary based on a key.
+    private String get(String key) {
+    return get(key, null);
+    }
+    /** Method to retrieve a phrase from the dictionary based on a key.
       * @param key A <strong>String</strong> used to find the correct phrase.
       * @return A <strong>String</strong> containing the correct phrase with the correct formatting.
       */
      private String get(String key, String args[]) {
           if(key.indexOf(".") == -1) {
                 key = "CDM.ArgumentConfiguration." + key;
+          }
           return gatherer.dictionary.get(key, args);
+     }
      /** This class encapsulates all the technical difficulty of creating a specific control based on an Argument. */
      private class ArgumentControl
           extends JPanel {
           /** The Argument this control will be based on. */
           private Argument argument = null;
           /** One of a possible two buttons available for adding to this control. */
           private JButton one = null;
           /** The second of two buttons available for adding to this control. */
           private JButton two = null;
           /** A checkbox to allow enabling or diabling of this Argument. */
           private JCheckBox enabled = null;
           /** Some form of editor component, such as a JComboBox or JTextField, used to set parameters to an Argument. */
           private JComponent value = null;
           /** Can be used in place of the other editor components if a list is required. */
           private JList list = null;
           /** Constructor.
             * @param argument The <strong>Argument</strong> this control will be built around.
             * @see org.greenstone.gatherer.cdm.ArgumentConfiguration.ArgumentControl.AddListener
             * @see org.greenstone.gatherer.cdm.ArgumentConfiguration.ArgumentControl.EnabledListener
             * @see org.greenstone.gatherer.cdm.ArgumentConfiguration.ArgumentControl.HierarchyListener
             * @see org.greenstone.gatherer.cdm.ArgumentConfiguration.ArgumentControl.ListOption
             * @see org.greenstone.gatherer.cdm.ArgumentConfiguration.ArgumentControl.RemoveListener
             * @see org.greenstone.gatherer.cdm.ArgumentConfiguration.ArgumentControl.ToolTipUpdater
             */
           public ArgumentControl(Argument argument) {
                 this.argument = argument;
                 String tip = "<html>" + argument.getDesc() + "</html>";
                 tip = Utility.formatHTMLWidth(tip, 60);
+    private String get(String key, String args[]) {
+    if(key.indexOf(".") == -1) {
+        key = "CDM.ArgumentConfiguration." + key;
+    }
+    return gatherer.dictionary.get(key, args);
+    }
+    /** This class encapsulates all the technical difficulty of creating a specific control based on an Argument. */
+    private class ArgumentControl
+    extends JPanel {
+    /** The Argument this control will be based on. */
+    private Argument argument = null;
+    /** One of a possible two buttons available for adding to this control. */
+    private JButton one = null;
+    /** The second of two buttons available for adding to this control. */
+    private JButton two = null;
+    /** A checkbox to allow enabling or diabling of this Argument. */
+    private JCheckBox enabled = null;
+    /** Some form of editor component, such as a JComboBox or JTextField, used to set parameters to an Argument. */
+    private JComponent value = null;
+    /** Can be used in place of the other editor components if a list is required. */
+    private JList list = null;
+    /** Constructor.
+     * @param argument The <strong>Argument</strong> this control will be built around.
+     * @see org.greenstone.gatherer.cdm.ArgumentConfiguration.ArgumentControl.AddListener
+     * @see org.greenstone.gatherer.cdm.ArgumentConfiguration.ArgumentControl.EnabledListener
+     * @see org.greenstone.gatherer.cdm.ArgumentConfiguration.ArgumentControl.HierarchyListener
+     * @see org.greenstone.gatherer.cdm.ArgumentConfiguration.ArgumentControl.ListOption
+     * @see org.greenstone.gatherer.cdm.ArgumentConfiguration.ArgumentControl.RemoveListener
+     * @see org.greenstone.gatherer.cdm.ArgumentConfiguration.ArgumentControl.ToolTipUpdater
+     */
+    public ArgumentControl(Argument argument) {
+        this.argument = argument;
+        String tip = "<html>" + argument.getDesc() + "</html>";
+        tip = Utility.formatHTMLWidth(tip, 60);
                 // If this is the first control, there is no history.
+                if(previous_owner == null) {
+                     previous_owner = argument.getOwner();
+                     addHeader(previous_owner, Color.white);
+        if(previous_owner == null) {
+        previous_owner = argument.getOwner();
+        addHeader(previous_owner, Color.white);
+        }
+                // Otherwise if the owner of the control has changed since the last argument, toggle the colouring of the control.
+        else if(previous_owner != argument.getOwner()) {
+        coloured = !coloured;
+        previous_owner = argument.getOwner();
+        addHeader(previous_owner, (coloured ? Gatherer.config.getColor("coloring.collection_tree_background", false) : Color.white));
+        }
+                // Create
+        if(coloured) {
+        setBackground(Gatherer.config.getColor("coloring.collection_tree_background", false));
+        }
+        else {
+        setBackground(Color.white);
+        }
+        JLabel owner_label = new JLabel(argument.getOwner());
+        owner_label.setOpaque(false);
+        JLabel label = new JLabel(argument.getName());
+        label.setOpaque(false);
+        label.setPreferredSize(LABEL_SIZE);
+        label.setToolTipText(tip);
+        enabled = new JCheckBox(argument.getName());
+        enabled.setOpaque(false);
+        enabled.setPreferredSize(LABEL_SIZE);
+        enabled.setToolTipText(tip);
+        JPanel inner_pane = new JPanel();
+        inner_pane.setOpaque(false);
+        String existing_value = argument.getValue();
+        String default_value = argument.getDefaultValue();
+        switch(argument.getType()) {
+        case Argument.ENUM:
+        // Build an option model, wrapping each entry of the list table.
+        HashMap arg_list = argument.getList();
+        ArrayList options_model = new ArrayList();
+        Iterator it = arg_list.keySet().iterator();
+        while(it.hasNext()) {
+            String key = (String) it.next();
+            options_model.add(new ListOption(key, (String)arg_list.get(key)));
+        }
+        Collections.sort(options_model);
+        value = new JComboBox(options_model.toArray());
+        ((JComboBox)value).addActionListener(new ToolTipUpdater());
+        if(existing_value != null) {
+            // Select the correct value. Since they're all text strings we better iterate to be safe.
+            selectValue((JComboBox)value, existing_value);
+        }
+        else if(default_value != null) {
+            // Same as above except for default value.
+            selectValue((JComboBox)value, default_value);
+        }
+        break;
+        case Argument.FLAG:
+        // Only need the check box.
+        break;
+        case Argument.HIERARCHY:
+        value = new JComboBox(gatherer.c_man.msm.getAssignedElements(true));
+        /** @TODO - figure out a smarter way of allowing Greenstone extracted metadata to be selected. */
+        ((JComboBox)value).setEditable(true);
+        ((JComboBox)value).addItemListener(new HierarchyListener());
+        // Now ensure we have the existing value or default value selected if either exist.
+        if(existing_value != null) {
+            selectValue((JComboBox)value, existing_value);
+        }
+        else if(default_value != null) {
+            selectValue((JComboBox)value, default_value);
+        }
+        break;
+        case Argument.INTEGER:
+        case Argument.STRING:
+        // Use a standard text field
+        if(existing_value != null) {
+            value = new JTextField(existing_value);
+        }
+        else {
+            if(default_value != null) {
+            value = new JTextField(default_value);
+            }
+            // Special test just for the hfile field.
+            else if(argument.getName().equals("hfile")) {
+            // Work through previous controls looking for the metadata one.
+            for(int i = 0; i < central_pane.getComponentCount(); i++) {
+                Object object = central_pane.getComponent(i);
+                if(object instanceof ArgumentControl) {
+                ArgumentControl control = (ArgumentControl) object;
+                if(control.toString().equals("metadata")) {
+                    Object temp = control.getValue();
+                    if(temp != null) {
+                    value = new JTextField(temp.toString() + ".txt");
+                    }
+                }
+                // Otherwise if the owner of the control has changed since the last argument, toggle the colouring of the control.
+                else if(previous_owner != argument.getOwner()) {
+                     coloured = !coloured;
+                     previous_owner = argument.getOwner();
+                     addHeader(previous_owner, (coloured ? Gatherer.config.getColor("coloring.collection_tree_background", false) : Color.white));
+                }
+                // Create
+                if(coloured) {
+                     setBackground(Gatherer.config.getColor("coloring.collection_tree_background", false));
+                }
+                else {
+                     setBackground(Color.white);
+                }
+                JLabel owner_label = new JLabel(argument.getOwner());
+                owner_label.setOpaque(false);
+                JLabel label = new JLabel(argument.getName());
+                label.setOpaque(false);
+                label.setPreferredSize(LABEL_SIZE);
+                label.setToolTipText(tip);
+                enabled = new JCheckBox(argument.getName());
+                enabled.setOpaque(false);
+                enabled.setPreferredSize(LABEL_SIZE);
+                enabled.setToolTipText(tip);
+                JPanel inner_pane = new JPanel();
+                inner_pane.setOpaque(false);
+                String existing_value = argument.getValue();
+                String default_value = argument.getDefaultValue();
+                switch(argument.getType()) {
+                case Argument.ENUM:
+                     // Build an option model, wrapping each entry of the list table.
+                     HashMap arg_list = argument.getList();
+                     ArrayList options_model = new ArrayList();
+                     Iterator it = arg_list.keySet().iterator();
+                     while(it.hasNext()) {
+                          String key = (String) it.next();
+                          options_model.add(new ListOption(key, (String)arg_list.get(key)));
+                     }
+                     Collections.sort(options_model);
+                     value = new JComboBox(options_model.toArray());
+                     ((JComboBox)value).addActionListener(new ToolTipUpdater());
+                     if(existing_value != null) {
+                          // Select the correct value. Since they're all text strings we better iterate to be safe.
+                          selectValue((JComboBox)value, existing_value);
+                     }
+                     else if(default_value != null) {
+                          // Same as above except for default value.
+                          selectValue((JComboBox)value, default_value);
+                     }
+                     break;
+                case Argument.FLAG:
+                     // Only need the check box.
+                     break;
+                case Argument.HIERARCHY:
+                     value = new JComboBox(gatherer.c_man.msm.getAssignedElements(true));
+                     /** @TODO - figure out a smarter way of allowing Greenstone extracted metadata to be selected. */
+                     ((JComboBox)value).setEditable(true);
+                     ((JComboBox)value).addItemListener(new HierarchyListener());
+                     // Now ensure we have the existing value or default value selected if either exist.
+                     if(existing_value != null) {
+                          selectValue((JComboBox)value, existing_value);
+                     }
+                     else if(default_value != null) {
+                          selectValue((JComboBox)value, default_value);
+                     }
+                     break;
+                case Argument.INTEGER:
+                case Argument.STRING:
+                     // Use a standard text field
+                     if(existing_value != null) {
+                          value = new JTextField(existing_value);
+                     }
+                     else {
+                          if(default_value != null) {
+                                value = new JTextField(default_value);
+                          }
+                          // Special test just for the hfile field.
+                          else if(argument.getName().equals("hfile")) {
+                                // Work through previous controls looking for the metadata one.
+                                for(int i = 0; i < central_pane.getComponentCount(); i++) {
+                                     Object object = central_pane.getComponent(i);
+                                     if(object instanceof ArgumentControl) {
+                                          ArgumentControl control = (ArgumentControl) object;
+                                          if(control.toString().equals("metadata")) {
+                                                Object temp = control.getValue();
+                                                if(temp != null) {
+                                                     value = new JTextField(temp.toString() + ".txt");
+                                                }
+                                          }
+                                     }
+                                }
+                          }
+                          else {
+                                value = new JTextField();
+                          }
+                     }
+                     break;
+                case Argument.LANGUAGE:
+                     value = new JComboBox(manager.languages.getLanguageCodes().toArray());
+                     // Now ensure we have the existing value or default value selected if either exist.
+                     Language selected = null;
+                     if(existing_value != null) {
+                          selected = manager.languages.getLanguage(existing_value, false);
+                     }
+                     else if(default_value != null) {
+                          selected = manager.languages.getLanguage(default_value, false);
+                     }
+                     if(selected != null) {
+                          ((JComboBox)value).setSelectedItem(selected);
+                     }
+                     break;
+                case Argument.METADATA:
+                     value = new JComboBox(gatherer.c_man.msm.getAssignedElements());
+                     /** @TODO - figure out a smarter way of allowing Greenstone extracted metadata to be selected. */
+                     ((JComboBox)value).setEditable(true);
+                     // Now ensure we have the existing value or default value selected if either exist.
+                     if(existing_value != null) {
+                          selectValue((JComboBox)value, existing_value);
+                     }
+                     else if(default_value != null) {
+                          selectValue((JComboBox)value, default_value);
+                     }
+                     break;
+                case Argument.METADATUM:
+                     // Comma separated metadata values.
+                     ArrayList values = argument.getValues();
+                     value = new JComboBox(gatherer.c_man.msm.getAssignedElements());
+                     DefaultListModel model = new DefaultListModel();
+                     list = new JList(model);
+                     list.setVisibleRowCount(3);
+                     for(int i = 0; i < values.size(); i++) {
+                          model.addElement(values.get(i));
+                     }
+                     one = new JButton(get("Add"));
+                     one.addActionListener(new AddListener((JComboBox)value, list));
+                     two = new JButton(get("Remove"));
+                     two.addActionListener(new RemoveListener(list));
+                     if(argument.getValues().size() > 0 || argument.isRequired()) {
+                          enabled.setSelected(true);
+                          list.setBackground(Color.white);
+                          list.setEnabled(true);
+                          one.setEnabled(true);
+                          two.setEnabled(true);
+                          value.setEnabled(true);
+                     }
+                     else {
+                          enabled.setSelected(false);
+                          list.setBackground(Color.lightGray);
+                          list.setEnabled(false);
+                          one.setEnabled(false);
+                          two.setEnabled(false);
+                          value.setEnabled(false);
+                     }
+                     break;
+                }
+                }
+            }
+            }
+            else {
+            value = new JTextField();
+            }
+        }
+        break;
+        case Argument.LANGUAGE:
+        value = new JComboBox(manager.languages.getLanguageCodes().toArray());
+        // Now ensure we have the existing value or default value selected if either exist.
+        Language selected = null;
+        if(existing_value != null) {
+            selected = manager.languages.getLanguage(existing_value, false);
+        }
+        else if(default_value != null) {
+            selected = manager.languages.getLanguage(default_value, false);
+        }
+        if(selected != null) {
+            ((JComboBox)value).setSelectedItem(selected);
+        }
+        break;
+        case Argument.METADATA:
+        value = new JComboBox(gatherer.c_man.msm.getAssignedElements());
+        /** @TODO - figure out a smarter way of allowing Greenstone extracted metadata to be selected. */
+        ((JComboBox)value).setEditable(true);
+        // Now ensure we have the existing value or default value selected if either exist.
+        if(existing_value != null) {
+            selectValue((JComboBox)value, existing_value);
+        }
+        else if(default_value != null) {
+            selectValue((JComboBox)value, default_value);
+        }
+        break;
+        case Argument.METADATUM:
+        // Comma separated metadata values.
+        ArrayList values = argument.getValues();
+        value = new JComboBox(gatherer.c_man.msm.getAssignedElements());
+        DefaultListModel model = new DefaultListModel();
+        list = new JList(model);
+        list.setVisibleRowCount(3);
+        for(int i = 0; i < values.size(); i++) {
+            model.addElement(values.get(i));
+        }
+        one = new JButton(get("Add"));
+        one.addActionListener(new AddListener((JComboBox)value, list));
+        two = new JButton(get("Remove"));
+        two.addActionListener(new RemoveListener(list));
+        if(argument.getValues().size() > 0 || argument.isRequired()) {
+            enabled.setSelected(true);
+            list.setBackground(Color.white);
+            list.setEnabled(true);
+            one.setEnabled(true);
+            two.setEnabled(true);
+            value.setEnabled(true);
+        }
+        else {
+            enabled.setSelected(false);
+            list.setBackground(Color.lightGray);
+            list.setEnabled(false);
+            one.setEnabled(false);
+            two.setEnabled(false);
+            value.setEnabled(false);
+        }
+        break;
+        }
                 // Enable or disable as necessary.
                 if(argument.isRequired() || argument.isAssigned()) {
                      enabled.setSelected(true);
                      if(value != null) {
                           value.setOpaque(true);
                           value.setBackground(Color.white);
                           value.setEnabled(true);
+                     }
+                }
                 else {
                      enabled.setSelected(false);
                      if(value != null) {
                           value.setOpaque(true);
                           value.setBackground(Color.lightGray);
                           value.setEnabled(false);
+                     }
+                }
+        if(argument.isRequired() || argument.isAssigned()) {
+        enabled.setSelected(true);
+        if(value != null) {
+            value.setOpaque(true);
+            value.setBackground(Color.white);
+            value.setEnabled(true);
+        }
+        }
+        else {
+        enabled.setSelected(false);
+        if(value != null) {
+            value.setOpaque(true);
+            value.setBackground(Color.lightGray);
+            value.setEnabled(false);
+        }
+        }
                 // Listener
                 if(value != null && !argument.isRequired()) {
                      enabled.addActionListener(new EnabledListener(one, two, list, value));
+                }
+        if(value != null && !argument.isRequired()) {
+        enabled.addActionListener(new EnabledListener(one, two, list, value));
+        }
                 // Layout
                 if(list == null) {
                      enabled.setBorder(BorderFactory.createEmptyBorder(0,0,5,0));
                      inner_pane.setLayout(new BorderLayout());
                      if(argument.isRequired()) {
                           inner_pane.add(label, BorderLayout.WEST);
+                     }
                      else {
                           inner_pane.add(enabled, BorderLayout.WEST);
+                     }
                      if(value != null) {
                           inner_pane.add(value, BorderLayout.CENTER);
+                     }
+                }
                 else {
                      JPanel control_pane = new JPanel(new GridLayout(2,1));
                      control_pane.add(enabled);
                      control_pane.add(value);
                      control_pane.setOpaque(false);
                      JPanel left_pane = new JPanel(new BorderLayout());
                      left_pane.add(control_pane, BorderLayout.CENTER);
                      left_pane.add(one, BorderLayout.SOUTH);
                      left_pane.setOpaque(false);
                      JPanel right_pane = new JPanel(new BorderLayout());
                      right_pane.add(new JScrollPane(list), BorderLayout.CENTER);
                      right_pane.add(two, BorderLayout.SOUTH);
                      right_pane.setOpaque(false);
                      inner_pane.setLayout(new GridLayout(1,2));
                      inner_pane.add(left_pane);
                      inner_pane.add(right_pane);
+                }
                 setLayout(new BorderLayout());
+        if(list == null) {
+        enabled.setBorder(BorderFactory.createEmptyBorder(0,0,5,0));
+        inner_pane.setLayout(new BorderLayout());
+        if(argument.isRequired()) {
+            inner_pane.add(label, BorderLayout.WEST);
+        }
+        else {
+            inner_pane.add(enabled, BorderLayout.WEST);
+        }
+        if(value != null) {
+            inner_pane.add(value, BorderLayout.CENTER);
+        }
+        }
+        else {
+        JPanel control_pane = new JPanel(new GridLayout(2,1));
+        control_pane.add(enabled);
+        control_pane.add(value);
+        control_pane.setOpaque(false);
+        JPanel left_pane = new JPanel(new BorderLayout());
+        left_pane.add(control_pane, BorderLayout.CENTER);
+        left_pane.add(one, BorderLayout.SOUTH);
+        left_pane.setOpaque(false);
+        JPanel right_pane = new JPanel(new BorderLayout());
+        right_pane.add(new JScrollPane(list), BorderLayout.CENTER);
+        right_pane.add(two, BorderLayout.SOUTH);
+        right_pane.setOpaque(false);
+        inner_pane.setLayout(new GridLayout(1,2));
+        inner_pane.add(left_pane);
+        inner_pane.add(right_pane);
+        }
+        setLayout(new BorderLayout());
                 //add(owner_label, BorderLayout.NORTH);
                 add(inner_pane, BorderLayout.CENTER);
+          }
           public Object getValue() {
                 if(value instanceof JComboBox) {
                      return ((JComboBox)value).getSelectedItem();
+                }
                 else if(value instanceof JTextField) {
                      return ((JTextField)value).getText();
+                }
                 return null;
+          }
           /** Identifies this control by returning the name of the Argument it is based on.
+        add(inner_pane, BorderLayout.CENTER);
+    }
+    public Object getValue() {
+        if(value instanceof JComboBox) {
+        return ((JComboBox)value).getSelectedItem();
+        }
+        else if(value instanceof JTextField) {
+        return ((JTextField)value).getText();
+        }
+        return null;
+    }
+    /** Identifies this control by returning the name of the Argument it is based on.
             * @return The name of the Argument as a <strong>String</strong>.
             * @see org.greenstone.gatherer.cdm.Argument
             */
           public String toString() {
                 return argument.getName();
+          }
           /** Updates the enwrapped Argument using the values provided by the controls.
+    public String toString() {
+        return argument.getName();
+    }
+    /** Updates the enwrapped Argument using the values provided by the controls.
             * @return <i>true</i> if the update was successful, <i>false</i> otherwise.
             * @see org.greenstone.gatherer.cdm.ArgumentConfiguration.ArgumentControl.ListOption
 …
             * @see org.greenstone.gatherer.msm.ElementWrapper
             */
           public boolean updateArgument() {
                 if(enabled.isSelected() || argument.isRequired()) {
                      argument.setAssigned(true);
                      String result = null;
                      switch(argument.getType()) {
                      case Argument.ENUM:
                           ListOption option = (ListOption)((JComboBox)value).getSelectedItem();
                           result = option.getValue();
                           if(result.length() > 0) {
                                 argument.setValue(result);
+                          }
                           else {
                                 if(argument.isRequired()) {
                                      String args[] = new String[1];
                                      args[0] = argument.getName();
                                      JOptionPane.showMessageDialog(self, get("Required_Argument", args), get("Error_Title"), JOptionPane.ERROR_MESSAGE);
                                      args = null;
                                      return false;
+                                }
                                 else {
                                      argument.setValue(null);
+                                }
+                          }
                           return true;
                      case Argument.FLAG:
                           // Should have already been handled above.
                           return true;
                      case Argument.INTEGER:
                           result = ((JTextField)value).getText();
                           if(result.length() > 0) {
                                 // Test if the value entered is a valid int.
                                 try {
                                      int x = Integer.parseInt(result);
+                                }
                                 catch(NumberFormatException nfe) {
                                      String args[] = new String[2];
                                      args[0] = argument.getName();
                                      args[1] = result;
                                      JOptionPane.showMessageDialog(self, get("Bad_Integer", args), get("Error_Title"), JOptionPane.ERROR_MESSAGE);
                                      args = null;
                                      return false;
+                                }
                                 argument.setValue(result);
+                          }
                           else {
                                 if(argument.isRequired()) {
                                      String args[] = new String[1];
                                      args[0] = argument.getName();
                                      JOptionPane.showMessageDialog(self, get("Required_Argument", args), get("Error_Title"), JOptionPane.ERROR_MESSAGE);
                                      args = null;
                                      return false;
+                                }
                                 else {
                                      argument.setValue(null);
+                                }
+                          }
                           return true;
                      case Argument.LANGUAGE:
                           Language language = (Language) ((JComboBox)value).getSelectedItem();
                           argument.setValue(language.getCode());
                           // Kinda lucked out here. Its impossible not to choose an entry from these comboboxes as they are restricted.
                           return true;
                      case Argument.METADATA:
                      case Argument.HIERARCHY:
                           argument.setValue(((JComboBox)value).getSelectedItem().toString());
                           // Kinda lucked out here. Its impossible not to choose an entry from these comboboxes as they are restricted.
                           return true;
                      case Argument.METADATUM:
                           DefaultListModel model = (DefaultListModel)list.getModel();
                           ArrayList values = new ArrayList();
                           for(int i = 0; i < model.size(); i++) {
                                 values.add(model.get(i));
+                          }
                           argument.setValues(values);
                           return true;
                      case Argument.STRING:
                           result = ((JTextField)value).getText();
                           if(result.length() > 0) {
                                 argument.setValue(result);
+                          }
                           else {
                                 if(argument.isRequired()) {
                                      String args[] = new String[1];
                                      args[0] = argument.getName();
                                      JOptionPane.showMessageDialog(self, get("Required_Argument", args), get("Error_Title"), JOptionPane.ERROR_MESSAGE);
                                      return false;
+                                }
                                 else {
                                      argument.setValue(null);
+                                }
+                          }
                           return true;
+                     }
                      return false;
+                }
                 else {
                      argument.setAssigned(false);
                      return true;
+                }
+          }
           /** Method to ensure that a certain value is selected, if it exists within that combobox to begin with.
+    public boolean updateArgument() {
+        if(enabled.isSelected() || argument.isRequired()) {
+        argument.setAssigned(true);
+        String result = null;
+        switch(argument.getType()) {
+        case Argument.ENUM:
+            ListOption option = (ListOption)((JComboBox)value).getSelectedItem();
+            result = option.getValue();
+            if(result.length() > 0) {
+            argument.setValue(result);
+            }
+            else {
+            if(argument.isRequired()) {
+                String args[] = new String[1];
+                args[0] = argument.getName();
+                JOptionPane.showMessageDialog(self, get("Required_Argument", args), get("Error_Title"), JOptionPane.ERROR_MESSAGE);
+                args = null;
+                return false;
+            }
+            else {
+                argument.setValue(null);
+            }
+            }
+            return true;
+        case Argument.FLAG:
+            // Should have already been handled above.
+            return true;
+        case Argument.INTEGER:
+            result = ((JTextField)value).getText();
+            if(result.length() > 0) {
+            // Test if the value entered is a valid int.
+            try {
+                int x = Integer.parseInt(result);
+            }
+            catch(NumberFormatException nfe) {
+                String args[] = new String[2];
+                args[0] = argument.getName();
+                args[1] = result;
+                JOptionPane.showMessageDialog(self, get("Bad_Integer", args), get("Error_Title"), JOptionPane.ERROR_MESSAGE);
+                args = null;
+                return false;
+            }
+            argument.setValue(result);
+            }
+            else {
+            if(argument.isRequired()) {
+                String args[] = new String[1];
+                args[0] = argument.getName();
+                JOptionPane.showMessageDialog(self, get("Required_Argument", args), get("Error_Title"), JOptionPane.ERROR_MESSAGE);
+                args = null;
+                return false;
+            }
+            else {
+                argument.setValue(null);
+            }
+            }
+            return true;
+        case Argument.LANGUAGE:
+            Language language = (Language) ((JComboBox)value).getSelectedItem();
+            argument.setValue(language.getCode());
+            // Kinda lucked out here. Its impossible not to choose an entry from these comboboxes as they are restricted.
+            return true;
+        case Argument.METADATA:
+        case Argument.HIERARCHY:
+            argument.setValue(((JComboBox)value).getSelectedItem().toString());
+            // Kinda lucked out here. Its impossible not to choose an entry from these comboboxes as they are restricted.
+            return true;
+        case Argument.METADATUM:
+            DefaultListModel model = (DefaultListModel)list.getModel();
+            ArrayList values = new ArrayList();
+            for(int i = 0; i < model.size(); i++) {
+            values.add(model.get(i));
+            }
+            argument.setValues(values);
+            return true;
+        case Argument.STRING:
+            result = ((JTextField)value).getText();
+            if(result.length() > 0) {
+            argument.setValue(result);
+            }
+            else {
+            if(argument.isRequired()) {
+                String args[] = new String[1];
+                args[0] = argument.getName();
+                JOptionPane.showMessageDialog(self, get("Required_Argument", args), get("Error_Title"), JOptionPane.ERROR_MESSAGE);
+                return false;
+            }
+            else {
+                argument.setValue(null);
+            }
+            }
+            return true;
+        }
+        return false;
+        }
+        else {
+        argument.setAssigned(false);
+        return true;
+        }
+    }
+    /** Method to ensure that a certain value is selected, if it exists within that combobox to begin with.
             * @param combobox The <strong>JComboBox</strong> whose selection we are trying to preset.
             * @param target The desired value of the selection as a <strong>String</strong>.
 …
             * @see org.greenstone.gatherer.msm.ElementWrapper
             */
           public void selectValue(JComboBox combobox, String target) {
                 for(int i = 0; i < combobox.getItemCount(); i++) {
                      Object object = combobox.getItemAt(i);
                      if(object instanceof ListOption) {
                           ListOption lo = (ListOption) object;
                           if(lo.getValue().equals(target)) {
                                 combobox.setSelectedIndex(i);
                                 return;
+                          }
+                     }
                      else if(object instanceof ElementWrapper) {
                           if(object.toString().equals(target)) {
                                 combobox.setSelectedIndex(i);
                                 return;
+                          }
+                     }
+                }
+          }
           /** Forces the control into an 'enabled' mode. */
           public void setEnabled() {
                 enabled.setSelected(true);
+          }
           /** Explicitly sets the value of a JTextField type control to the given String.
+    public void selectValue(JComboBox combobox, String target) {
+        for(int i = 0; i < combobox.getItemCount(); i++) {
+        Object object = combobox.getItemAt(i);
+        if(object instanceof ListOption) {
+            ListOption lo = (ListOption) object;
+            if(lo.getValue().equals(target)) {
+            combobox.setSelectedIndex(i);
+            return;
+            }
+        }
+        else if(object instanceof ElementWrapper) {
+            if(object.toString().equals(target)) {
+            combobox.setSelectedIndex(i);
+            return;
+            }
+        }
+        }
+    }
+    /** Forces the control into an 'enabled' mode. */
+    public void setEnabled() {
+        enabled.setSelected(true);
+    }
+    /** Explicitly sets the value of a JTextField type control to the given String.
             * @param value_str The new value of the control as a <strong>String</strong>.
             */
           public void setValue(String value_str) {
                 ((JTextField)value).setText(value_str);
+          }
           /** Listener which adds entries to a list from a combobox when fired. */
           private class AddListener
                 implements ActionListener {
+    public void setValue(String value_str) {
+        ((JTextField)value).setText(value_str);
+    }
+    /** Listener which adds entries to a list from a combobox when fired. */
+    private class AddListener
+        implements ActionListener {
                 /** The model behind the target list. */
                 private DefaultListModel model = null;
+        private DefaultListModel model = null;
                 /** The source for data to be added to the list. */
                 private JComboBox source = null;
+        private JComboBox source = null;
                 /** The list to add data to. */
                 private JList target = null;
+        private JList target = null;
                 /** Constructor.
                  * @param source A <strong>JComboBox</strong> which serves as the source for data.
                  * @param target A <strong>JList</strong> which serves as the target for data.
                  */
                 public AddListener(JComboBox source, JList target) {
                      this.model = (DefaultListModel) target.getModel();
                      this.source = source;
                      this.target = target;
+                }
+        public AddListener(JComboBox source, JList target) {
+        this.model = (DefaultListModel) target.getModel();
+        this.source = source;
+        this.target = target;
+        }
                 /** When the add button is clicked, we attempt to add the selected metadata from the source into the target.
                  * @param event An <strong>ActionEvent</strong> containing information about the event.
                  * @see org.greenstone.gatherer.msm.ElementWrapper
                  */
                 public void actionPerformed(ActionEvent event) {
                      ElementWrapper element = (ElementWrapper) source.getSelectedItem();
                      String name = element.toString();
                      if(!model.contains(name)) {
                           boolean found = false;
                           int index = 0;
                           while(!found && index < model.size()) {
                                 String sibling = (String) model.get(index);
                                 if(name.compareTo(sibling) < 0) {
                                      model.add(index, name);
                                      found = true;
+                                }
                                 else {
                                      index++;
+                                }
+                          }
                           if(!found) {
                                 model.addElement(name);
+                          }
+                     }
+                }
+          }
           /** Listens for actions apon the enable checkbox, and if detected enables or diables control appropriately. */
           private class EnabledListener
                 implements ActionListener {
+        public void actionPerformed(ActionEvent event) {
+        ElementWrapper element = (ElementWrapper) source.getSelectedItem();
+        String name = element.toString();
+        if(!model.contains(name)) {
+            boolean found = false;
+            int index = 0;
+            while(!found && index < model.size()) {
+            String sibling = (String) model.get(index);
+            if(name.compareTo(sibling) < 0) {
+                model.add(index, name);
+                found = true;
+            }
+            else {
+                index++;
+            }
+            }
+            if(!found) {
+            model.addElement(name);
+            }
+        }
+        }
+    }
+    /** Listens for actions apon the enable checkbox, and if detected enables or diables control appropriately. */
+    private class EnabledListener
+        implements ActionListener {
                 /** One of two possible buttons that might have their enabled state changed by this listener. */
                 private JButton one = null;
+        private JButton one = null;
                 /** One of two possible buttons that might have their enabled state changed by this listener. */
                 private JButton two = null;
+        private JButton two = null;
                 /** An editor component, such as a JComboBox or JTextField, that might have its enabled state changed by this listener. */
                 private JComponent target = null;
+        private JComponent target = null;
                 /** A list which might have its enabled state changed by this listener. */
                 private JList list = null;
+        private JList list = null;
                 /** Constructor.
                  * @param one A <strong>JButton</strong> whose enabled state is determined by the listener, or <i>null</i> if no button.
 …
                  * @param list A <strong>JComponent</strong> whose enabled state is determined by the listener, or <i>null</i> if no component.
                  */
                 public EnabledListener(JButton one, JButton two, JList list, JComponent target) {
                      this.list = list;
                      this.one = one;
                      this.target = target;
                      this.two = two;
+                }
+        public EnabledListener(JButton one, JButton two, JList list, JComponent target) {
+        this.list = list;
+        this.one = one;
+        this.target = target;
+        this.two = two;
+        }
                 /** Any implementation of ActionListener must include this method so that we can be informed when an action has been performed on or registered check box, prompting us to change the state of the other controls as per the users request.
                  * @param event An <strong>ActionEvent</strong> containing information about the click.
                  */
                 public void actionPerformed(ActionEvent event) {
                      JCheckBox source = (JCheckBox)event.getSource();
                      if(source.isSelected()) {
                           target.setBackground(Color.white);
                           target.setEnabled(true);
                           if(one != null && two != null && list != null) {
                                 one.setEnabled(true);
                                 two.setEnabled(true);
                                 list.setBackground(Color.white);
                                 list.setEnabled(true);
+                          }
+                     }
                      else {
                           target.setBackground(Color.lightGray);
                           target.setEnabled(false);
                           if(one != null && two != null && list != null) {
                                 one.setEnabled(false);
                                 two.setEnabled(false);
                                 list.setBackground(Color.lightGray);
                                 list.setEnabled(false);
+                          }
+                     }
+                }
+          }
           /** If a metadata element is selected that requires an hfile, then this listener defaults that hfile. */
           private class HierarchyListener
                 implements ItemListener {
+        public void actionPerformed(ActionEvent event) {
+        JCheckBox source = (JCheckBox)event.getSource();
+        if(source.isSelected()) {
+            target.setBackground(Color.white);
+            target.setEnabled(true);
+            if(one != null && two != null && list != null) {
+            one.setEnabled(true);
+            two.setEnabled(true);
+            list.setBackground(Color.white);
+            list.setEnabled(true);
+            }
+        }
+        else {
+            target.setBackground(Color.lightGray);
+            target.setEnabled(false);
+            if(one != null && two != null && list != null) {
+            one.setEnabled(false);
+            two.setEnabled(false);
+            list.setBackground(Color.lightGray);
+            list.setEnabled(false);
+            }
+        }
+        }
+    }
+    /** If a metadata element is selected that requires an hfile, then this listener defaults that hfile. */
+    private class HierarchyListener
+        implements ItemListener {
                 /** Any implementation of ItemListener must include this method so that we can be informed when an item from the list is selected, and generate a predetermined hfile for that selection.
                  * @param event An <strong>ItemEvent</strong> containing information about the selection.
 …
                  * @see org.greenstone.gatherer.valuetree.GValueModel
                  */
                 public void itemStateChanged(ItemEvent event) {
                      // Determine if the selected element represents a hierarchy.
                      Object temp = ((JComboBox)value).getSelectedItem();
                      String filename = temp.toString();
                      // Search for a argument control called hfile and enable and set value.
                      for(int i = 0; i < central_pane.getComponentCount(); i++) {
                           Object object = central_pane.getComponent(i);
                           if(object instanceof ArgumentControl) {
                                 ArgumentControl control = (ArgumentControl) object;
                                 if(control.toString().equals("hfile")) {
                                      control.setValue(filename + ".txt");
                                      control.setEnabled(true);
+                                }
+                          }
+                     }
+                }
+          }
           /** A ListOption is a compound item which is constructed from several Strings. That magic part is that the length of screen real-estate used by the text version of this item is limited. */
           private class ListOption
                 implements Comparable {
+        public void itemStateChanged(ItemEvent event) {
+        // Determine if the selected element represents a hierarchy.
+        Object temp = ((JComboBox)value).getSelectedItem();
+        String filename = temp.toString();
+        // Search for a argument control called hfile and enable and set value.
+        for(int i = 0; i < central_pane.getComponentCount(); i++) {
+            Object object = central_pane.getComponent(i);
+            if(object instanceof ArgumentControl) {
+            ArgumentControl control = (ArgumentControl) object;
+            if(control.toString().equals("hfile")) {
+                control.setValue(filename + ".txt");
+                control.setEnabled(true);
+            }
+            }
+        }
+        }
+    }
+    /** A ListOption is a compound item which is constructed from several Strings. That magic part is that the length of screen real-estate used by the text version of this item is limited. */
+    private class ListOption
+        implements Comparable {
                 /** The maximum length of this String version of this item. */
                 private int MAX_DESC = 35;
+        private int MAX_DESC = 35;
                 /** The description of the value for this item. */
                 private String description = null;
+        private String description = null;
                 /** A cached value for the text value of this option, as it never changes after the first call to toString(). */
                 private String text = null;
+        private String text = null;
                 /** The value for this item. */
                 private String value = null;
+        private String value = null;
                 /** Constructor.
                  * @param value The value for this item as a <strong>String</strong>.
                  * @param description The description of the value as a <strong>String</strong>.
                  */
                 public ListOption(String value, String description) {
                      this.description = description;
                      this.value = value;
+                }
+        public ListOption(String value, String description) {
+        this.description = description;
+        this.value = value;
+        }
                 /** Compare two possible ListOption objects for ordering.
                  * @param object The <strong>Object</strong> to compare to.
 …
                  * @see java.lang.String#compareTo
                  */
                 public int compareTo(Object object) {
                      return toString().compareTo(object.toString());
+                }
+        public int compareTo(Object object) {
+        return toString().compareTo(object.toString());
+        }
                 /** Tests two possible ListOption objects for equality. Uses the result from compareTo().
                  * @param The <strong>Object</strong> which may be equal.
                  * @return <i>true</i> if the objects are equal, <i>false</i> otherwise.
                  */
                 public boolean equals(Object object) {
                      return (compareTo(object) == 0);
+                }
+        public boolean equals(Object object) {
+        return (compareTo(object) == 0);
+        }
                 /** Retrieve the description of this list item.
                  * @return The description as a <strong>String</strong>.
                  */
                 public String getDesc() {
                      return description;
+                }
+        public String getDesc() {
+        return description;
+        }
                 /** Retrieve the value of this list item.
                  * @return The value as a <strong>String</strong>.
                  */
                 public String getValue() {
                      return value;
+                }
+        public String getValue() {
+        return value;
+        }
                 /** Convert this object into a nice readable String.
                  * @return A <strong>String</strong> representing this object.
                  */
                 public String toString() {
                      if(text == null) {
                           if(description.length() >= MAX_DESC) {
                                 text = value + " - " + description.substring(0, MAX_DESC);
+                          }
                           else {
                                 text = value + " - " + description;
+                          }
+                     }
                      return text;
+                }
+          }
           /** Listener which removes entries from a list from a combobox when fired. */
           private class RemoveListener
                 implements ActionListener {
+        public String toString() {
+        if(text == null) {
+            if(description.length() >= MAX_DESC) {
+            text = value + " - " + description.substring(0, MAX_DESC);
+            }
+            else {
+            text = value + " - " + description;
+            }
+        }
+        return text;
+        }
+    }
+    /** Listener which removes entries from a list from a combobox when fired. */
+    private class RemoveListener
+        implements ActionListener {
                 /** The model behind the target list. */
                 private DefaultListModel model = null;
+        private DefaultListModel model = null;
                 /** The list to remove data from. */
                 private JList target = null;
+        private JList target = null;
                 /** Constructor.
                  * @param target A <strong>JList</strong>.
                  */
                 public RemoveListener(JList target) {
                      this.model = (DefaultListModel) target.getModel();
                      this.target = target;
+                }
+        public RemoveListener(JList target) {
+        this.model = (DefaultListModel) target.getModel();
+        this.target = target;
+        }
                 /** When the remove button is clicked, we attempt to remove the selected metadata from the target.
                  * @param event An <strong>ActionEvent</strong> containing information about the event.
                  */
                 public void actionPerformed(ActionEvent event) {
                      if(!target.isSelectionEmpty()) {
                           int index = target.getSelectedIndex();
                           model.remove(index);
+                     }
+                }
+          }
           /** Listener that sets the tooltip associated to a combobox to the tooltip relevant to the selected item. */
           private class ToolTipUpdater
                 implements ActionListener {
+        public void actionPerformed(ActionEvent event) {
+        if(!target.isSelectionEmpty()) {
+            int index = target.getSelectedIndex();
+            model.remove(index);
+        }
+        }
+    }
+    /** Listener that sets the tooltip associated to a combobox to the tooltip relevant to the selected item. */
+    private class ToolTipUpdater
+        implements ActionListener {
                 /** Any implementation of an ActionListener must include this method so that we can be informed when the selection in a combobox has changed and update the tooltip accordingly.
                  * @param event An <strong>ActionEvent</strong> containing information about the action that fired this call.
                  */
                 public void actionPerformed(ActionEvent event) {
                      JComboBox source = (JComboBox)event.getSource();
                      ListOption lo = (ListOption)source.getSelectedItem();
                      String description = Utility.formatHTMLWidth(lo.getDesc(), 60);
                      source.setToolTipText(description);
+                }
+          }
+     }
+        public void actionPerformed(ActionEvent event) {
+        JComboBox source = (JComboBox)event.getSource();
+        ListOption lo = (ListOption)source.getSelectedItem();
+        String description = Utility.formatHTMLWidth(lo.getDesc(), 60);
+        source.setToolTipText(description);
+        }
+    }
+    }
+}

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

-              r4293
+              r4366
  */
 public interface ArgumentContainer {
      /** Method to retrieve the list of arguments from this container. Note that this method returns both the containers arguments plus its 'supers' arguments if any, and alphabetically orders them.
       * @return The arguments within a <strong>ArrayList</strong>.
       */
      public ArrayList getArguments();
      /** Method to retrieve this containers custom argument string.
       * @return The custom arguments as a <strong>String</strong>.
       */
      public String getCustom();
      /** Method to retrieve the name associated with this argument container.
       * @return The name as a <strong>String</strong>.
       */
      public String getName();
      /** Method to set the custom arguments string.
       * @param custom The new custom argument <strong>String</strong>.
       */
      public void setCustom(String custom);
+    /** Method to retrieve the list of arguments from this container. Note that this method returns both the containers arguments plus its 'supers' arguments if any, and alphabetically orders them.
+     * @return The arguments within a <strong>ArrayList</strong>.
+     */
+    public ArrayList getArguments();
+    /** Method to retrieve this containers custom argument string.
+     * @return The custom arguments as a <strong>String</strong>.
+     */
+    public String getCustom();
+    /** Method to retrieve the name associated with this argument container.
+     * @return The name as a <strong>String</strong>.
+     */
+    public String getName();
+    /** Method to set the custom arguments string.
+     * @param custom The new custom argument <strong>String</strong>.
+     */
+    public void setCustom(String custom);
+}

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

-              r4293
+              r4366
 // ####################################################################################
 public class Classifier
      extends ArrayList
      implements ArgumentContainer, Comparable, Serializable {
      /** A reference to the classifier that this one inherits from. */
      private Classifier super_classifier = null;
      /** A reference to the manager of this classifier. Only available once the classifiers been assigned, always <i>null</i> for classifiers in reserve. */
      private ClassifierManager manager = null;
      /** Custom arguments (ie those unparsable from classinfo.pl) provided to this class. */
      private String custom = null;
      /** A description of this classifier. */
      private String desc = null;
      /** The name of the classifier as it would appear in the collect.cfg file. */
      private String name = null;
      /** A list of format commands that are dependant on this classifier. */
      private ArrayList dependant_formats = null;
      /** Default Constructor.
       */
      public Classifier() {
           super();
           dependant_formats = new ArrayList();
+     }
      /** Constructor.
+    extends ArrayList
+    implements ArgumentContainer, Comparable, Serializable {
+    /** A reference to the classifier that this one inherits from. */
+    private Classifier super_classifier = null;
+    /** A reference to the manager of this classifier. Only available once the classifiers been assigned, always <i>null</i> for classifiers in reserve. */
+    private ClassifierManager manager = null;
+    /** Custom arguments (ie those unparsable from classinfo.pl) provided to this class. */
+    private String custom = null;
+    /** A description of this classifier. */
+    private String desc = null;
+    /** The name of the classifier as it would appear in the collect.cfg file. */
+    private String name = null;
+    /** A list of format commands that are dependant on this classifier. */
+    private ArrayList dependant_formats = null;
+    /** Default Constructor.
+     */
+    public Classifier() {
+    super();
+    dependant_formats = new ArrayList();
+    }
+    /** Constructor.
       * @param name The name of this classifier as a <strong>String</strong>.
       * @param desc A description of this classifier as a <strong>String</strong>.
       * @param super_classifier The super class of this classifier, as a <strong>Classifier</strong>.
       */
      public Classifier(String name, String desc, Classifier super_classifier) {
           this();
           this.desc = desc;
           this.name = name;
           this.super_classifier = super_classifier;
+     }
      /** Method to add an argument to this classifier. Only adds the argument if it isn't already present.
+    public Classifier(String name, String desc, Classifier super_classifier) {
+    this();
+    this.desc = desc;
+    this.name = name;
+    this.super_classifier = super_classifier;
+    }
+    /** Method to add an argument to this classifier. Only adds the argument if it isn't already present.
       * @param argument The <strong>Argument</strong> to add.
       */
      public void addArgument(Argument argument) {
           if(!contains(argument)) {
                 add(argument);
                 argument.setOwner(name);
+          }
+     }
      /** Method to register a dependant format with this classifier. If the classifier changes, this format also needs to be updated.
+    public void addArgument(Argument argument) {
+    if(!contains(argument)) {
+        add(argument);
+        argument.setOwner(name);
+    }
+    }
+    /** Method to register a dependant format with this classifier. If the classifier changes, this format also needs to be updated.
       * @param format A <strong>Format</strong> which is dependant on this classifier.
       */
      public void addDependantFormat(Format format) {
           dependant_formats.add(format);
+     }
      /** Method to compare two classifiers for ordering.
+    public void addDependantFormat(Format format) {
+    dependant_formats.add(format);
+    }
+    /** Method to compare two classifiers for ordering.
       * @param object The classifier we are comparing to, as an <strong>Object</strong>.
       * @return An <i>int</i> specifying the classifier order, using values as set out in String.
       * @see java.lang.String#compareTo
       */
      public int compareTo(Object object) {
           if(object instanceof Classifier) {
                 Classifier classifier = (Classifier) object;
                 return name.compareTo(classifier.getName());
+          }
           return name.compareTo(object.toString());
+     }
      /** This method produces a deep copy of this classifier. Note that this also creates a new copy of each of the super classes of classifiers as well. This is the way it should be, as each assigned classifier may have different values for the higher classifiers (such as BasPlug).
+    public int compareTo(Object object) {
+    if(object instanceof Classifier) {
+        Classifier classifier = (Classifier) object;
+        return name.compareTo(classifier.getName());
+    }
+    return name.compareTo(object.toString());
+    }
+    /** This method produces a deep copy of this classifier. Note that this also creates a new copy of each of the super classes of classifiers as well. This is the way it should be, as each assigned classifier may have different values for the higher classifiers (such as BasPlug).
       * @return A newly created <strong>Classifier</strong> with the same details and Arguments as this one.
       * @see org.greenstone.gatherer.cdm.Argument
       */
      public Classifier copy() {
           Classifier copy = null;
           if(super_classifier == null) {
                 copy = new Classifier(name, desc, null);
+          }
           else {
                 copy = new Classifier(name, desc, super_classifier.copy());
+          }
           for(int i = 0; i < size(); i++) {
                 copy.addArgument(((Argument)get(i)).copy());
+          }
           return copy;
+     }
      /** Method to determine if two classifiers are equal.
+    public Classifier copy() {
+    Classifier copy = null;
+    if(super_classifier == null) {
+        copy = new Classifier(name, desc, null);
+    }
+    else {
+        copy = new Classifier(name, desc, super_classifier.copy());
+    }
+    for(int i = 0; i < size(); i++) {
+        copy.addArgument(((Argument)get(i)).copy());
+    }
+    return copy;
+    }
+    /** Method to determine if two classifiers are equal.
       * @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) {
           if(object instanceof CustomClassifier) {
                 CustomClassifier classifier = (CustomClassifier) object;
                 return (toString().equalsIgnoreCase(classifier.getCommand()));
+          }
           else {
                 return(toString().equalsIgnoreCase(object.toString()));
+          }
+     }
      /** Method to retrieve an argument by its name.
+    public boolean equals(Object object) {
+    if(object instanceof CustomClassifier) {
+        CustomClassifier classifier = (CustomClassifier) object;
+        return (toString().equalsIgnoreCase(classifier.getCommand()));
+    }
+    else {
+        return(toString().equalsIgnoreCase(object.toString()));
+    }
+    }
+    /** Method to retrieve an argument by its name.
       * @param name The name of the argument as a <strong>String</strong>.
       * @return The <strong>Argument</strong> requested, or <i>null</i> if no such argument.
       */
      public Argument getArgument(String name) {
           // The name given may still include the '-'
           if(name.startsWith("-")) {
                 name = name.substring(1);
+          }
           ArrayList arguments = getArguments();
           for(int i = 0; i < arguments.size(); i++) {
                 Argument argument = (Argument)arguments.get(i);
                 if(argument.getName().equals(name)) {
                      return argument;
+                }
+          }
           return null;
+     }
      /** Method to retrieve all of the arguments available to a classifier, including both specific and general ones.
+    public Argument getArgument(String name) {
+    // The name given may still include the '-'
+    if(name.startsWith("-")) {
+        name = name.substring(1);
+    }
+    ArrayList arguments = getArguments();
+    for(int i = 0; i < arguments.size(); i++) {
+        Argument argument = (Argument)arguments.get(i);
+        if(argument.getName().equals(name)) {
+        return argument;
+        }
+    }
+    return null;
+    }
+    /** Method to retrieve all of the arguments available to a classifier, including both specific and general ones.
       * @return A <strong>Hashtable</strong> of arguments, with &lt;name&gt; -&gt; &lt;argument&gt; entries.
       */
      public ArrayList getArguments() {
           ArrayList all_arguments = new ArrayList(this);
           if(super_classifier != null) {
                 ArrayList super_arguments = super_classifier.getArguments();
                 for(int i = 0; i < super_arguments.size(); i++) {
                      Object argument = super_arguments.get(i);
                      if(!all_arguments.contains(argument)) {
                           all_arguments.add(argument);
+                     }
+                }
+          }
           return all_arguments;
+     }
      /** Method to retrieve a classifiers custom argument information.
+    public ArrayList getArguments() {
+    ArrayList all_arguments = new ArrayList(this);
+    if(super_classifier != null) {
+        ArrayList super_arguments = super_classifier.getArguments();
+        for(int i = 0; i < super_arguments.size(); i++) {
+        Object argument = super_arguments.get(i);
+        if(!all_arguments.contains(argument)) {
+            all_arguments.add(argument);
+        }
+        }
+    }
+    return all_arguments;
+    }
+    /** Method to retrieve a classifiers custom argument information.
       * @return The custom arguments as a <strong>String</strong>.
       */
      public String getCustom() {
           return custom;
+     }
      /** Method to retrieve a classifiers name.
+    public String getCustom() {
+    return custom;
+    }
+    /** Method to retrieve a classifiers name.
       * @return A <strong>String</strong> containing the classifiers name.
       */
      public String getName() {
           return name;
+     }
      /** Method to retrieve the position of this classifier as a special keyword or the form "CL#" where # is the classifiers order in the set of classifiers. Note that if this is called for a Classifier that has never been assigned a position of 'Search' is returned, as this is the only case where we will try to write a Classifier that does not have a manager.
+    public String getName() {
+    return name;
+    }
+    /** Method to retrieve the position of this classifier as a special keyword or the form "CL#" where # is the classifiers order in the set of classifiers. Note that if this is called for a Classifier that has never been assigned a position of 'Search' is returned, as this is the only case where we will try to write a Classifier that does not have a manager.
       * @return A <strong>String</strong> containing the special position keyword.
       * @see org.greenstone.gatherer.cdm.ClassifierManager
       */
      public String getPositionString() {
           if(manager == null) {
                 return "Search";
+          }
           return "CL" + (manager.indexOf(this) + 1);
+     }
      /** Method to set the value of custom.
+    public String getPositionString() {
+    if(manager == null) {
+        return "Search";
+    }
+    return "CL" + (manager.indexOf(this) + 1);
+    }
+    /** Method to set the value of custom.
       * @param custom The new value of custom as a <strong>String</strong>.
       */
      public void setCustom(String custom) {
           this.custom = custom;
+     }
      /** Method to set the value of desc.
+    public void setCustom(String custom) {
+    this.custom = custom;
+    }
+    /** Method to set the value of desc.
       * @param desc The new value of desc as a <strong>String</strong>.
       */
      public void setDesc(String desc) {
           this.desc = desc;
+     }
      /** Method to set the value of manager.
+    public void setDesc(String desc) {
+    this.desc = desc;
+    }
+    /** Method to set the value of manager.
       * @param manager The new manager as a <strong>ClassifierManager</strong>.
       */
      public void setManager(ClassifierManager manager) {
           this.manager = manager;
+     }
      /** Method to set the value of name.
+    public void setManager(ClassifierManager manager) {
+    this.manager = manager;
+    }
+    /** Method to set the value of name.
       * @param name The new value of name as a <strong>String</strong>.
       */
      public void setName(String name) {
           this.name = name;
+     }
      /** Method to set the value of the super_classifier.
+    public void setName(String name) {
+    this.name = name;
+    }
+    /** Method to set the value of the super_classifier.
       * @param super_classifier The new value of super_classifier as a <strong>Classifier</strong>, or <i>null</i> if this class has no inheritance.
       */
      public void setSuper(Classifier super_classifier) {
           this.super_classifier = super_classifier;
+     }
      /** Method to print out this classifier as it would appear as a command within the collection configuration file.
+    public void setSuper(Classifier super_classifier) {
+    this.super_classifier = super_classifier;
+    }
+    /** Method to print out this classifier as it would appear as a command within the collection configuration file.
       * @return A <strong>String</strong> containing a single classifier command.
       */
      public String toString() {
           StringBuffer text = new StringBuffer("classify ");
           text.append(name);
           text.append(" ");
           ArrayList arguments = getArguments();
           for(int i = 0; i < arguments.size(); i++) {
                 Argument argument = (Argument)arguments.get(i);
                 if(argument.isAssigned()) {
                      text.append(argument.toString());
                      text.append(" ");
+                }
+          }
           if(custom != null) {
                 text.append(custom);
+          }
           return text.toString();
+     }
+    public String toString() {
+    StringBuffer text = new StringBuffer("classify ");
+    text.append(name);
+    text.append(" ");
+    ArrayList arguments = getArguments();
+    for(int i = 0; i < arguments.size(); i++) {
+        Argument argument = (Argument)arguments.get(i);
+        if(argument.isAssigned()) {
+        text.append(argument.toString());
+        text.append(" ");
+        }
+    }
+    if(custom != null) {
+        text.append(custom);
+    }
+    return text.toString();
+    }
+}

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

-              r4293
+              r4366
 // ####################################################################################
 public class ClassifierManager
      implements MSMListener {
      /** An interface to the Gatherer, the creator of this cdm module, for access to the Greenstone installation directory. */
      private Gatherer gatherer = null;
      /** A reference to the CollectionDesignManager for access to other configuration managers. */
      private CollectionDesignManager manager = null;
      /** The controls for editing the contents of this manager. */
      private Control controls = null;
      /** A list of assigned classifiers. */
      private DynamicListModel assigned = null;
      /** A list of known, but currently unassigned, classifiers. */
      private DynamicListModel reserve = null;
      /** We may have somehow recieved a classifier command that are, in fact, custom classifiers which can refer to classifiers that haven't been parsed yet, so this holds a list of failed commands which are retried after the loading is complete. */
      private ArrayList unresolved_commands = null;
      /** Constructor.
       * @param gatherer A reference to the <strong>Gatherer</strong> for access to the Dictionary.
       * @param manager A reference to the <strong>CollectionDesignManager</strong> itself.
       * @see org.greenstone.gatherer.Gatherer
       * @see org.greenstone.gatherer.cdm.DynamicListModel
       * @see org.greenstone.gatherer.collection.CollectionManager
       * @see org.greenstone.gatherer.msm.MetadataSetManager
       * @see org.greenstone.gatherer.msm.MSMListener
       */
      public ClassifierManager(Gatherer gatherer, CollectionDesignManager manager) {
           this.assigned = new DynamicListModel();
           this.gatherer = gatherer;
           this.manager = manager;
           this.unresolved_commands = new ArrayList();
           loadClassifiers();
           saveClassifiers();
           // Register as a MSMListener.
           Gatherer.c_man.getCollection().msm.addMSMListener(this);
+     }
      /** Method to add a new classifier to reserve.
+    implements MSMListener {
+    /** An interface to the Gatherer, the creator of this cdm module, for access to the Greenstone installation directory. */
+    private Gatherer gatherer = null;
+    /** A reference to the CollectionDesignManager for access to other configuration managers. */
+    private CollectionDesignManager manager = null;
+    /** The controls for editing the contents of this manager. */
+    private Control controls = null;
+    /** A list of assigned classifiers. */
+    private DynamicListModel assigned = null;
+    /** A list of known, but currently unassigned, classifiers. */
+    private DynamicListModel reserve = null;
+    /** We may have somehow recieved a classifier command that are, in fact, custom classifiers which can refer to classifiers that haven't been parsed yet, so this holds a list of failed commands which are retried after the loading is complete. */
+    private ArrayList unresolved_commands = null;
+    /** Constructor.
+     * @param gatherer A reference to the <strong>Gatherer</strong> for access to the Dictionary.
+     * @param manager A reference to the <strong>CollectionDesignManager</strong> itself.
+     * @see org.greenstone.gatherer.Gatherer
+     * @see org.greenstone.gatherer.cdm.DynamicListModel
+     * @see org.greenstone.gatherer.collection.CollectionManager
+     * @see org.greenstone.gatherer.msm.MetadataSetManager
+     * @see org.greenstone.gatherer.msm.MSMListener
+     */
+    public ClassifierManager(Gatherer gatherer, CollectionDesignManager manager) {
+    this.assigned = new DynamicListModel();
+    this.gatherer = gatherer;
+    this.manager = manager;
+    this.unresolved_commands = new ArrayList();
+    loadClassifiers();
+    saveClassifiers();
+    // Register as a MSMListener.
+    Gatherer.c_man.getCollection().msm.addMSMListener(this);
+    }
+    /** Method to add a new classifier to reserve.
       * @param classifier The new <strong>Classifier</strong>.
       * @see org.greenstone.gatherer.cdm.DynamicListModel
       */
      public void addClassifier(Classifier classifier) {
           if(!reserve.contains(classifier)) {
                 reserve.addElement(classifier);
+          }
+     }
      /** Method to assign a classifier.
+    public void addClassifier(Classifier classifier) {
+    if(!reserve.contains(classifier)) {
+        reserve.addElement(classifier);
+    }
+    }
+    /** Method to assign a classifier.
       * @param classifier The reserve <strong>Classifier</strong> to assign.
       * @see org.greenstone.gatherer.cdm.DynamicListModel
       */
      public void assignClassifier(Classifier classifier) {
           if(!assigned.contains(classifier)) {
                 assigned.addElement(classifier);
                 classifier.setManager(this);
                 gatherer.c_man.configurationChanged();
+          }
+     }
      /** Method to assign a classifier.
+    public void assignClassifier(Classifier classifier) {
+    if(!assigned.contains(classifier)) {
+        assigned.addElement(classifier);
+        classifier.setManager(this);
+        gatherer.c_man.configurationChanged();
+    }
+    }
+    /** Method to assign a classifier.
       * @param classifier The <strong>CustomClassifier</strong> to assign.
       * @see org.greenstone.gatherer.cdm.DynamicListModel
       */
      public void assignClassifier(CustomClassifier classifier) {
           if(!assigned.contains(classifier)) {
                 assigned.addElement(classifier);
                classifier.setManager(this);
                 gatherer.c_man.configurationChanged();
+          }
+     }
      /** Destructor.
+    public void assignClassifier(CustomClassifier classifier) {
+    if(!assigned.contains(classifier)) {
+        assigned.addElement(classifier);
+        classifier.setManager(this);
+        gatherer.c_man.configurationChanged();
+    }
+    }
+    /** Destructor.
       * @see org.greenstone.gatherer.Gatherer
       * @see org.greenstone.gatherer.cdm.CollectionDesignManager
       * @see org.greenstone.gatherer.cdm.DynamicListModel
       */
      public void destroy() {
           // Deregister as a listener
           if(gatherer.c_man != null && gatherer.c_man.msm != null) {
                 gatherer.c_man.msm.removeMSMListener(this);
+          }
           // Null globals
           assigned = null;
           controls = null;
           gatherer = null;
           manager = null;
           reserve = null;
           unresolved_commands = null;
+     }
      /** Method to retrieve the classifier with the given index.
+    public void destroy() {
+    // Deregister as a listener
+    if(gatherer.c_man != null && gatherer.c_man.msm != null) {
+        gatherer.c_man.msm.removeMSMListener(this);
+    }
+    // Null globals
+    assigned = null;
+    controls = null;
+    gatherer = null;
+    manager = null;
+    reserve = null;
+    unresolved_commands = null;
+    }
+    /** Method to retrieve the classifier with the given index.
       * @param index The index of the desired classifier as an <i>int</i>.
       * @return The requested Classifier as an <strong>Object</strong> or <i>null</i> if no such classifier exists.
       * @see org.greenstone.gatherer.cdm.DynamicListModel
       */
      public Object getClassifier(int index) {
           if(0 <= index && index < assigned.size()) {
                 return assigned.get(index);
+          }
           return null;
+     }
      /** Method to retrieve the named classifier.
+    public Object getClassifier(int index) {
+    if(0 <= index && index < assigned.size()) {
+        return assigned.get(index);
+    }
+    return null;
+    }
+    /** Method to retrieve the named classifier.
       * @param name The name of the desired classifier as a <strong>String</strong>.
       * @return The requested <strong>Classifier</strong> or <i>null</i> if no such classifier exists.
       * @see org.greenstone.gatherer.cdm.DynamicListModel
       */
      public Classifier getClassifier(String name) {
           for(int i = 0; i < reserve.size(); i++) {
                 Classifier classifier = (Classifier)reserve.get(i);
                 if(classifier.getName().equals(name)) {
                      return classifier;
+                }
+          }
           // No success.
           return null;
+     }
      /** Method to retrieve the control for this manager.
+    public Classifier getClassifier(String name) {
+    for(int i = 0; i < reserve.size(); i++) {
+        Classifier classifier = (Classifier)reserve.get(i);
+        if(classifier.getName().equals(name)) {
+        return classifier;
+        }
+    }
+    // No success.
+    return null;
+    }
+    /** Method to retrieve the control for this manager.
       * @return A <strong>JPanel</strong> containing the controls.
       */
      public JPanel getControls() {
           if(controls == null) {
                 controls = new Control();
+          }
           return controls;
+     }
      /** Called whenever a metadata element changes significantly.
+    public JPanel getControls() {
+    if(controls == null) {
+        controls = new Control();
+    }
+    return controls;
+    }
+    /** Called whenever a metadata element changes significantly.
       * @param event A <strong>MSMEvent</strong> choc' full of event informationy goodness.
       */
      public void elementChanged(MSMEvent event) {
           // Don't really care, as the elements dealt with here are all live references so changes like identifier change will propagate immediately.
+     }
      /** Method to find the index of the given classifier within the assigned classifiers.
+    public void elementChanged(MSMEvent event) {
+    // Don't really care, as the elements dealt with here are all live references so changes like identifier change will propagate immediately.
+    }
+    /** Method to find the index of the given classifier within the assigned classifiers.
       * @param classifier The <strong>Classifier</strong> whose index you wish to find.
       * @return The index of the classifier as an <i>int</i>, which has a value of -1 if the classifier was not found.
       * @see org.greenstone.gatherer.cdm.DynamicListModel
       */
      public int indexOf(Classifier classifier) {
           for(int i = 0; i < assigned.size(); i++) {
                 Classifier sibling = (Classifier) assigned.get(i);
                 if(sibling.equals(classifier)) {
                      return i;
+                }
+          }
           return -1;
+     }
      /** Method to invalidate controls after a significant change in the system state.
       */
      public void invalidateControls() {
           if(controls != null) {
                 controls.destroy();
+          }
           controls = null;
+     }
      /** Method to load the details of a single plug-in.
+    public int indexOf(Classifier classifier) {
+    for(int i = 0; i < assigned.size(); i++) {
+        Classifier sibling = (Classifier) assigned.get(i);
+        if(sibling.equals(classifier)) {
+        return i;
+        }
+    }
+    return -1;
+    }
+    /** Method to invalidate controls after a significant change in the system state.
+      */
+    public void invalidateControls() {
+    if(controls != null) {
+        controls.destroy();
+    }
+    controls = null;
+    }
+    /** Method to load the details of a single plug-in.
       * @param classifier The classifier <strong>File</strong> you wish to load.
       */
      public void loadClassifier(File classifier) {
           ///ystem.err.println("Attempting to parse " + classifier.toString());
           Document document = null;
           long start;
           long end;
           // Run classinfo on this classifier, and then send the results for parsing.
           try {
                 String args[] = null;
                 if(Utility.isWindows()) {
                      args = new String[4];
                      if(Gatherer.config.perl_path != null) {
                           args[0] = gatherer.config.perl_path + "Perl.exe";
+                     }
                      else {
                           args[0] = "Perl.exe";
+                     }
                      args[1] = gatherer.config.gsdl_path + "bin" + File.separator + "script" + File.separator + "classinfo.pl";
                      args[2] = "-xml";
                      args[3] = getClassifierName(classifier);
+                }
                 else {
                      args = new String[3];
                      args[0] = "classinfo.pl";
                      args[1] = "-xml";
                      args[2] = getClassifierName(classifier);
+                }
+    public void loadClassifier(File classifier) {
+    ///ystem.err.println("Attempting to parse " + classifier.toString());
+    Document document = null;
+    long start;
+    long end;
+    // Run classinfo on this classifier, and then send the results for parsing.
+    try {
+        String args[] = null;
+        if(Utility.isWindows()) {
+        args = new String[4];
+        if(Gatherer.config.perl_path != null) {
+            args[0] = gatherer.config.perl_path + "Perl.exe";
+        }
+        else {
+            args[0] = "Perl.exe";
+        }
+        args[1] = gatherer.config.gsdl_path + "bin" + File.separator + "script" + File.separator + "classinfo.pl";
+        args[2] = "-xml";
+        args[3] = getClassifierName(classifier);
+        }
+        else {
+        args = new String[3];
+        args[0] = "classinfo.pl";
+        args[1] = "-xml";
+        args[2] = getClassifierName(classifier);
+        }
                 // Create the process.
                 Runtime runtime = Runtime.getRuntime();
                 Process process = runtime.exec(args);
                 InputStream input_stream = process.getErrorStream();
                 BufferedReader error_in = new BufferedReader(new InputStreamReader(process.getErrorStream()));
                 String line = "";
                 StringBuffer xml = new StringBuffer("");
                 while((line = error_in.readLine()) != null) {
                      xml.append(line);
                      xml.append("\n");
+                }
+        Runtime runtime = Runtime.getRuntime();
+        Process process = runtime.exec(args);
+        InputStream input_stream = process.getErrorStream();
+        BufferedReader error_in = new BufferedReader(new InputStreamReader(process.getErrorStream()));
+        String line = "";
+        StringBuffer xml = new StringBuffer("");
+        while((line = error_in.readLine()) != null) {
+        xml.append(line);
+        xml.append("\n");
+        }
                 // Then read the xml from the piped input stream.
                 InputSource source = new InputSource(new StringReader(xml.toString()));
                 DOMParser parser = new DOMParser();
                 parser.parse(source);
                 document = parser.getDocument();
+          }
           catch (Exception error) {
                 error.printStackTrace();
+        InputSource source = new InputSource(new StringReader(xml.toString()));
+        DOMParser parser = new DOMParser();
+        parser.parse(source);
+        document = parser.getDocument();
+    }
+    catch (Exception error) {
+        error.printStackTrace();
                 //ystem.err.println("Error: Cannot parse " + getClassifierName(classifier));
+          }
           if(document != null) {
                 parse(document.getDocumentElement());
+          }
+     }
      /** Called whenever the metadata value associated to a certain record changes. */
      public void metadataChanged(MSMEvent event) {
           FileNode record = event.getRecord();
           if(record != null) {
                 for(int i = 0; i < assigned.size(); i++) {
                      Object object = assigned.get(i);
                      if(object instanceof CustomClassifier) {
                           CustomClassifier classifier = (CustomClassifier) object;
                           classifier.process(record);
+                     }
+                }
+          }
+     }
      /** This method attempts to parse a classifier command from a command string taken from the collection configuration file. This process is quite complex as not only must the correct classifier be matched but also all of the parameters given must be legal. If such a command is found, the classifier is immediately assigned.
+    }
+    if(document != null) {
+        parse(document.getDocumentElement());
+    }
+    }
+    /** Called whenever the metadata value associated to a certain record changes. */
+    public void metadataChanged(MSMEvent event) {
+    FileNode record = event.getRecord();
+    if(record != null) {
+        for(int i = 0; i < assigned.size(); i++) {
+        Object object = assigned.get(i);
+        if(object instanceof CustomClassifier) {
+            CustomClassifier classifier = (CustomClassifier) object;
+            classifier.process(record);
+        }
+        }
+    }
+    }
+    /** This method attempts to parse a classifier command from a command string taken from the collection configuration file. This process is quite complex as not only must the correct classifier be matched but also all of the parameters given must be legal. If such a command is found, the classifier is immediately assigned.
       * @param command The command <strong>String</strong> that may include classifier information.
       * @return <i>true</i> if a classifier command was parsed, <i>false</i> otherwise.
 …
       * @see org.greenstone.gatherer.cdm.CommandTokenizer
       */
+     public boolean parse(String command) {
+          String command_lc = command.toLowerCase();
+          if(command_lc.startsWith("classify")) {
+                CommandTokenizer tokenizer = new CommandTokenizer(command);
+                if(tokenizer.countTokens() >= 2) {
+                     tokenizer.nextToken(); // Throw away 'classifier'
+                     String name = tokenizer.nextToken();
+                     // Try to locate the classifier with this name.
+                     Classifier classifier = getClassifier(name);
+                     // And if successful start to parse the arguments.
+                     if(classifier != null) {
+                          // Take a copy.
+                          classifier = classifier.copy();
+                          String key = null;
+                          while((key = tokenizer.nextToken()) != null) {
+                                // Try to retrieve a matching argument.
+                                Argument argument = classifier.getArgument(key);
+                                if(argument != null) {
+                                     // Set as assigned.
+                                     argument.setAssigned(true);
+                                     // And if the argument is of a parameter type, parse a parameter.
+                                     if(argument.getType() != Argument.FLAG && tokenizer.hasMoreTokens()) {
+                                          String value = tokenizer.nextToken();
+                                          value = value.replace(':', MSMUtils.NS_SEP);
+                                          argument.setValue(value);
+                                     }
+                                }
+                                // Argument cannot be matched.
+                                else {
+                                     String cur_key = key;
+                                     String value = tokenizer.nextToken();
+                                     if(value.startsWith("-")) {
+                                          key = value;
+                                          value = null;
+                                     }
+                                     else {
+                                          key = null;
+                                     }
+                                     String custom = classifier.getCustom();
+                                     if(custom == null) {
+                                          if(value == null) {
+                                                classifier.setCustom(cur_key);
+                                          }
+                                          else {
+                                                classifier.setCustom(cur_key + " " + value);
+                                          }
+                                     }
+                                     else {
+                                          if(value == null) {
+                                                classifier.setCustom(custom + " " + cur_key);
+                                          }
+                                          else {
+                                                classifier.setCustom(custom + " " + cur_key + " " + value);
+                                          }
+                                     }
+                                }
+                          }
+                          assignClassifier(classifier);
+                          return true;
+                     }
+                     else {
+                          ///ystem.err.println("Unknown classifier");
+                     }
+    public boolean parse(String command) {
+    String command_lc = command.toLowerCase();
+    if(command_lc.startsWith("classify")) {
+        CommandTokenizer tokenizer = new CommandTokenizer(command);
+        if(tokenizer.countTokens() >= 2) {
+        tokenizer.nextToken(); // Throw away 'classifier'
+        String name = tokenizer.nextToken();
+        // Try to locate the classifier with this name.
+        Classifier classifier = getClassifier(name);
+        // And if successful start to parse the arguments.
+        if(classifier != null) {
+            // Take a copy.
+            classifier = classifier.copy();
+            String key = null;
+            while((key = tokenizer.nextToken()) != null) {
+            // Try to retrieve a matching argument.
+            Argument argument = classifier.getArgument(key);
+            if(argument != null) {
+                // Set as assigned.
+                argument.setAssigned(true);
+                // And if the argument is of a parameter type, parse a parameter.
+                if(argument.getType() != Argument.FLAG && tokenizer.hasMoreTokens()) {
+                String value = tokenizer.nextToken();
+                value = value.replace(':', MSMUtils.NS_SEP);
+                argument.setValue(value);
+                }
+            }
+            // Argument cannot be matched.
+            else {
+                String cur_key = key;
+                String value = tokenizer.nextToken();
+                if(value.startsWith("-")) {
+                key = value;
+                value = null;
+                }
+                else {
+                key = null;
+                }
+                String custom = classifier.getCustom();
+                if(custom == null) {
+                if(value == null) {
+                    classifier.setCustom(cur_key);
+                }
+          }
+          else if(command_lc.startsWith("customclassifier")) {
+                unresolved_commands.add(command);
+                return true;
+          }
+          return false;
+     }
+     /** This method removes an assigned classifier. I was tempted to call it unassign, but remove is more consistant. Note that there is no way to remove a classifier from the reserve.
+                else {
+                    classifier.setCustom(cur_key + " " + value);
+                }
+                }
+                else {
+                if(value == null) {
+                    classifier.setCustom(custom + " " + cur_key);
+                }
+                else {
+                    classifier.setCustom(custom + " " + cur_key + " " + value);
+                }
+                }
+            }
+            }
+            assignClassifier(classifier);
+            return true;
+        }
+        else {
+            ///ystem.err.println("Unknown classifier");
+        }
+        }
+    }
+    else if(command_lc.startsWith("customclassifier")) {
+        unresolved_commands.add(command);
+        return true;
+    }
+    return false;
+    }
+    /** This method removes an assigned classifier. I was tempted to call it unassign, but remove is more consistant. Note that there is no way to remove a classifier from the reserve.
       * @param classifier The Classifier or CustomClassifier, as an <strong>Object</strong>, to remove.
       * @see org.greenstone.gatherer.cdm.DynamicListModel
       */
      public void removeClassifier(Object classifier) {
           assigned.removeElement(classifier);
           gatherer.c_man.configurationChanged();
+     }
      /** Method which attempts to reparse obvious classifier commands which previously referenced unresovable Classifiers.
+    public void removeClassifier(Object classifier) {
+    assigned.removeElement(classifier);
+    gatherer.c_man.configurationChanged();
+    }
+    /** Method which attempts to reparse obvious classifier commands which previously referenced unresovable Classifiers.
       * @see org.greenstone.gatherer.cdm.Classifier
       * @see org.greenstone.gatherer.cdm.CommandTokenizer
       * @see org.greenstone.gatherer.cdm.CustomClassifier
       */
      public void reparseUnresolved() {
           for(int i = 0; i < unresolved_commands.size(); i++) {
                 String command = (String) unresolved_commands.get(i);
                 CommandTokenizer tokenizer = new CommandTokenizer(command);
                 if(tokenizer.countTokens() >= 6) {
                      tokenizer.nextToken();// Loose customclassifier
                      // Get class name.
                      String class_name = tokenizer.nextToken();
                      // Parse arguments.
                      String replaces = null;
                      String separations = null;
                      while(tokenizer.hasMoreTokens()) {
                           String arg_name = tokenizer.nextToken();
                           if(arg_name.equalsIgnoreCase("-replaces")) {
                                 replaces = tokenizer.nextToken();
+                          }
                           else {
                                 separations = tokenizer.nextToken();
+                          }
+                     }
                      try {
                           replaces = replaces.substring(2);
                           int index = Integer.parseInt(replaces);
                           Classifier original = (Classifier)getClassifier(index);
                           if(original != null) {
                                 Class custom_classifier_class = Class.forName("org.greenstone.gatherer.cdm.custom." + class_name);
                                 CustomClassifier custom_classifier = (CustomClassifier) custom_classifier_class.newInstance();
                                 custom_classifier.setGatherer(gatherer);
                                 custom_classifier.recreate(original, separations);
                                 assigned.add(indexOf(original), custom_classifier);
                                 assigned.removeElement(original);
+                          }
                           else {
                                 ///ystem.err.println("Missing original.");
+                          }
+                     }
                      catch (Exception error) {
                           error.printStackTrace();
+                     }
+                }
+          }
           // Regardless of if they work, clear the commands.
           unresolved_commands.clear();
+     }
      /** Method to cache the current contents of reserve (known classifiers) to file.
+    public void reparseUnresolved() {
+    for(int i = 0; i < unresolved_commands.size(); i++) {
+        String command = (String) unresolved_commands.get(i);
+        CommandTokenizer tokenizer = new CommandTokenizer(command);
+        if(tokenizer.countTokens() >= 6) {
+        tokenizer.nextToken();// Loose customclassifier
+        // Get class name.
+        String class_name = tokenizer.nextToken();
+        // Parse arguments.
+        String replaces = null;
+        String separations = null;
+        while(tokenizer.hasMoreTokens()) {
+            String arg_name = tokenizer.nextToken();
+            if(arg_name.equalsIgnoreCase("-replaces")) {
+            replaces = tokenizer.nextToken();
+            }
+            else {
+            separations = tokenizer.nextToken();
+            }
+        }
+        try {
+            replaces = replaces.substring(2);
+            int index = Integer.parseInt(replaces);
+            Classifier original = (Classifier)getClassifier(index);
+            if(original != null) {
+            Class custom_classifier_class = Class.forName("org.greenstone.gatherer.cdm.custom." + class_name);
+            CustomClassifier custom_classifier = (CustomClassifier) custom_classifier_class.newInstance();
+            custom_classifier.setGatherer(gatherer);
+            custom_classifier.recreate(original, separations);
+            assigned.add(indexOf(original), custom_classifier);
+            assigned.removeElement(original);
+            }
+            else {
+            ///ystem.err.println("Missing original.");
+            }
+        }
+        catch (Exception error) {
+            error.printStackTrace();
+        }
+        }
+    }
+    // Regardless of if they work, clear the commands.
+    unresolved_commands.clear();
+    }
+    /** Method to cache the current contents of reserve (known classifiers) to file.
       * @see org.greenstone.gatherer.util.Utility
       */
      public void saveClassifiers() {
           try {
                 FileOutputStream file = new FileOutputStream(Utility.BASE_DIR + "classifiers.dat");
                 ObjectOutputStream out = new ObjectOutputStream(file);
                 out.writeObject(reserve);
                 out.close();
+          }
           catch (Exception error) {
+          }
+     }
      /** Called when a metadata set changed significantly.
+    public void saveClassifiers() {
+    try {
+        FileOutputStream file = new FileOutputStream(Utility.BASE_DIR + "classifiers.dat");
+        ObjectOutputStream out = new ObjectOutputStream(file);
+        out.writeObject(reserve);
+        out.close();
+    }
+    catch (Exception error) {
+    }
+    }
+    /** Called when a metadata set changed significantly.
       * @param event A <strong>MSMEvent</strong> containing information about the set change.
       */
      public void setChanged(MSMEvent event) {
           // Again, we would only worry about this if we contained 'inanimate' references to elements or something, but our references are live, and controls are rebuilt everytime a pop-up is needed.
+     }
      /** Method used to determine the number of classifiers that have been assigned.
+    public void setChanged(MSMEvent event) {
+    // Again, we would only worry about this if we contained 'inanimate' references to elements or something, but our references are live, and controls are rebuilt everytime a pop-up is needed.
+    }
+    /** Method used to determine the number of classifiers that have been assigned.
       * @return An <i>int</i> which is the number of classifiers.
       */
      public int size() {
           return assigned.size();
+     }
      /** Method to print out a block of classifier commands, much like you'd find in a collection configuration file.
+    public int size() {
+    return assigned.size();
+    }
+    /** Method to print out a block of classifier commands, much like you'd find in a collection configuration file.
       * @return A <strong>String</strong> containing a series of classifier commands separated by new lines.
       * @see org.greenstone.gatherer.cdm.Classifier
       * @see org.greenstone.gatherer.cdm.CustomClassifier
       */
      public String toString() {
           StringBuffer text = new StringBuffer();
           for(int i = 0; i < assigned.size(); i++) {
                 Object object = assigned.get(i);
                 if(object instanceof Classifier) {
                      Classifier classifier = (Classifier) object;
                      text.append(classifier.toString());
+                }
                 else if(object instanceof CustomClassifier) {
                      CustomClassifier classifier = (CustomClassifier) object;
                      text.append(classifier.getCommand());
                      text.append("\n");
                      text.append(classifier.getCustomCommand(i));
+                }
                 text.append("\n");
+          }
           text.append("\n");
           return text.toString();
+     }
      /** Called when a significant change has occured to a value tree for a certain element, however we take no further action.
+    public String toString() {
+    StringBuffer text = new StringBuffer();
+    for(int i = 0; i < assigned.size(); i++) {
+        Object object = assigned.get(i);
+        if(object instanceof Classifier) {
+        Classifier classifier = (Classifier) object;
+        text.append(classifier.toString());
+        }
+        else if(object instanceof CustomClassifier) {
+        CustomClassifier classifier = (CustomClassifier) object;
+        text.append(classifier.getCommand());
+        text.append("\n");
+        text.append(classifier.getCustomCommand(i));
+        }
+        text.append("\n");
+    }
+    text.append("\n");
+    return text.toString();
+    }
+    /** Called when a significant change has occured to a value tree for a certain element, however we take no further action.
       * @param event A <strong>MSMEvent</strong> containing information relevant to the event.
       */
      public void valueChanged(MSMEvent event) {
+     }
      /** Retrieve a phrase from the dictionary based on a certain key.
+    public void valueChanged(MSMEvent event) {
+    }
+    /** Retrieve a phrase from the dictionary based on a certain key.
       * @param key The search <strong>String</strong>.
       * @return The matching phrase from the Dictionary.
       */
      private String get(String key) {
           return get(key, null);
+     }
      /** Retrieve a phrase from the dictionary based on a certain key and certain arguments.
+    private String get(String key) {
+    return get(key, null);
+    }
+    /** Retrieve a phrase from the dictionary based on a certain key and certain arguments.
       * @param key The search <strong>String</strong>.
       * @param args A <strong>String[]</strong> used to complete and format the returned phrase.
 …
       * @see org.greenstone.gatherer.Gatherer
       */
      private String get(String key, String args[]) {
           if(key.indexOf(".") == -1) {
                 key = "CDM.ClassifierManager." + key;
+          }
           return gatherer.dictionary.get(key, args);
+     }
      /** Method to extract just the classifiers name from a file object.
+    private String get(String key, String args[]) {
+    if(key.indexOf(".") == -1) {
+        key = "CDM.ClassifierManager." + key;
+    }
+    return gatherer.dictionary.get(key, args);
+    }
+    /** Method to extract just the classifiers name from a file object.
       * @param classifier The <strong>File</strong> which references a certain classifier.
       * @return A <strong>String</strong> containing just the classifiers name, without extension.
       */
      private String getClassifierName(File classifier) {
           String name = classifier.getName();
           if(name.indexOf(".") != -1) {
                 name = name.substring(0, name.indexOf("."));
+          }
           return name;
+     }
      /** Method to initially load information from the standard plug-ins within the gsdl Perl library.
+    private String getClassifierName(File classifier) {
+    String name = classifier.getName();
+    if(name.indexOf(".") != -1) {
+        name = name.substring(0, name.indexOf("."));
+    }
+    return name;
+    }
+    /** Method to initially load information from the standard plug-ins within the gsdl Perl library.
       * @see org.greenstone.gatherer.cdm.DynamicListModel
       * @see org.greenstone.gatherer.util.Utility
       */
      private void loadClassifiers() {
           // Attempt to restore the cached file.
           try {
                 FileInputStream file = new FileInputStream(Utility.BASE_DIR + "classifiers.dat");
                 ObjectInputStream input = new ObjectInputStream(file);
                 reserve = (DynamicListModel) input.readObject();
+          }
           catch (Exception error) {
+          }
           if(reserve == null) {
                 reserve = new DynamicListModel();
+    private void loadClassifiers() {
+    // Attempt to restore the cached file.
+    try {
+        FileInputStream file = new FileInputStream(Utility.BASE_DIR + "classifiers.dat");
+        ObjectInputStream input = new ObjectInputStream(file);
+        reserve = (DynamicListModel) input.readObject();
+    }
+    catch (Exception error) {
+    }
+    if(reserve == null) {
+        reserve = new DynamicListModel();
                 // Retrieve the gsdl home directory...
                 String directory = gatherer.config.gsdl_path;
                 directory = directory + "perllib" + File.separator + "classify" + File.separator;
                 loadClassifiers(new File(directory));
+          }
+     }
      /** Method to load plug-in information from a specified directory. Of course no plug-ins may be found at this location.
+        String directory = gatherer.config.gsdl_path;
+        directory = directory + "perllib" + File.separator + "classify" + File.separator;
+        loadClassifiers(new File(directory));
+    }
+    }
+    /** Method to load plug-in information from a specified directory. Of course no plug-ins may be found at this location.
       * @param directory A <strong>File</strong> indicating the directory to be scanned for plug-ins.
       * @see org.greenstone.gatherer.cdm.ParsingProgress
       */
      private void loadClassifiers(File directory) {
           File files[] = directory.listFiles();
           if(files != null) {
+    private void loadClassifiers(File directory) {
+    File files[] = directory.listFiles();
+    if(files != null) {
                 // Create a progress indicator.
                 ParsingProgress progress = new ParsingProgress(get("CDM.ClassifierManager.Parsing.Title"), get("CDM.ClassifierManager.Parsing.Message"), files.length);
                 for(int i = 0; i < files.length; i++) {
                      // We only want to check Perl Modules.
                      if(files[i].getName().endsWith(".pm")) {
                           loadClassifier(files[i]);
+                     }
                      progress.inc();
+                }
                 progress.dispose();
                 progress.destroy();
                 progress = null;
+          }
+     }
      /** Parses a DOM tree model turning it into a Classifier and its associated arguments.
+        ParsingProgress progress = new ParsingProgress(get("CDM.ClassifierManager.Parsing.Title"), get("CDM.ClassifierManager.Parsing.Message"), files.length);
+        for(int i = 0; i < files.length; i++) {
+        // We only want to check Perl Modules.
+        if(files[i].getName().endsWith(".pm")) {
+            loadClassifier(files[i]);
+        }
+        progress.inc();
+        }
+        progress.dispose();
+        progress.destroy();
+        progress = null;
+    }
+    }
+    /** Parses a DOM tree model turning it into a Classifier and its associated arguments.
       * @param root The <strong>Node</strong> at the root of the DOM model.
       * @return A newly created <strong>Classifier</strong> based on the information parsed from the DOM model.
       * @see org.greenstone.gatherer.cdm.Argument
       */
+     private Classifier parse(Node root) {
+          Classifier classifier = new Classifier();
+          String node_name = null;
+          for(Node node = root.getFirstChild(); node != null;
+                node = node.getNextSibling()) {
+                node_name = node.getNodeName();
+                if(node_name.equals("Name")) {
+                     String name = MSMUtils.getValue(node);
+                     // We can save ourselves some processing time if a classifier with this name already exists in our manager. If so retrieve it and return it.
+                     Classifier existing = getClassifier(name);
+                     if(existing != null) {
+                          return existing;
+                     }
+                     classifier.setName(name);
+    private Classifier parse(Node root) {
+    Classifier classifier = new Classifier();
+    String node_name = null;
+    for(Node node = root.getFirstChild(); node != null;
+        node = node.getNextSibling()) {
+        node_name = node.getNodeName();
+        if(node_name.equals("Name")) {
+        String name = MSMUtils.getValue(node);
+        // We can save ourselves some processing time if a classifier with this name already exists in our manager. If so retrieve it and return it.
+        Classifier existing = getClassifier(name);
+        if(existing != null) {
+            return existing;
+        }
+        classifier.setName(name);
+        }
+        else if(node_name.equals("Desc")) {
+        classifier.setDesc(MSMUtils.getValue(node));
+        }
+                // Parse the multitude of arguments.
+        else if(node_name.equals("Arguments")) {
+        for(Node arg = node.getFirstChild(); arg != null; arg = arg.getNextSibling()) {
+            node_name = arg.getNodeName();
+            // An option.
+            if(node_name.equals("Option")) {
+            Argument argument = new Argument();
+            // If its an option we parse the multitude of details an options might have.
+            for(Node det = arg.getFirstChild(); det != null; det = det.getNextSibling()) {
+                node_name = det.getNodeName();
+                if(node_name.equals("Name")) {
+                argument.setName(MSMUtils.getValue(det));
+                }
+                else if(node_name.equals("Desc")) {
+                argument.setDesc(MSMUtils.getValue(det));
+                }
+                else if(node_name.equals("Type")) {
+                argument.setType(MSMUtils.getValue(det));
+                }
+                else if(node_name.equals("Default")) {
+                argument.setDefault(MSMUtils.getValue(det));
+                }
+                else if(node_name.equals("List")) {
+                // Two final loops are required to parse lists.
+                for(Node value = det.getFirstChild(); value != null; value = value.getNextSibling()) {
+                    if(value.getNodeName().equals("Value")) {
+                    String key = null;
+                    String desc = "";
+                    for(Node subvalue = value.getFirstChild(); subvalue != null; subvalue = subvalue.getNextSibling()) {
+                        node_name = subvalue.getNodeName();
+                        if(node_name.equals("Name")) {
+                        key = MSMUtils.getValue(subvalue);
+                        }
+                        else if(node_name.equals("Desc")) {
+                        desc = MSMUtils.getValue(subvalue);
+                        }
+                    }
+                    if(key != null) {
+                        argument.addOption(key, desc);
+                    }
+                    }
+                }
+                else if(node_name.equals("Desc")) {
+                     classifier.setDesc(MSMUtils.getValue(node));
+                }
+                else if(node_name.equals("Required")) {
+                String v = MSMUtils.getValue(det);
+                ///ystem.err.println("Required = " + v);
+                if(v.equalsIgnoreCase("yes")) {
+                    ///ystem.err.println("Setting required to true.");
+                    argument.setRequired(true);
+                }
+                // Parse the multitude of arguments.
+                else if(node_name.equals("Arguments")) {
+                     for(Node arg = node.getFirstChild(); arg != null; arg = arg.getNextSibling()) {
+                          node_name = arg.getNodeName();
+                          // An option.
+                          if(node_name.equals("Option")) {
+                                Argument argument = new Argument();
+                                // If its an option we parse the multitude of details an options might have.
+                                for(Node det = arg.getFirstChild(); det != null; det = det.getNextSibling()) {
+                                     node_name = det.getNodeName();
+                                     if(node_name.equals("Name")) {
+                                          argument.setName(MSMUtils.getValue(det));
+                                     }
+                                     else if(node_name.equals("Desc")) {
+                                          argument.setDesc(MSMUtils.getValue(det));
+                                     }
+                                     else if(node_name.equals("Type")) {
+                                          argument.setType(MSMUtils.getValue(det));
+                                     }
+                                     else if(node_name.equals("Default")) {
+                                          argument.setDefault(MSMUtils.getValue(det));
+                                     }
+                                     else if(node_name.equals("List")) {
+                                          // Two final loops are required to parse lists.
+                                          for(Node value = det.getFirstChild(); value != null; value = value.getNextSibling()) {
+                                                if(value.getNodeName().equals("Value")) {
+                                                     String key = null;
+                                                     String desc = "";
+                                                     for(Node subvalue = value.getFirstChild(); subvalue != null; subvalue = subvalue.getNextSibling()) {
+                                                          node_name = subvalue.getNodeName();
+                                                          if(node_name.equals("Name")) {
+                                                                key = MSMUtils.getValue(subvalue);
+                                                          }
+                                                          else if(node_name.equals("Desc")) {
+                                                                desc = MSMUtils.getValue(subvalue);
+                                                          }
+                                                     }
+                                                     if(key != null) {
+                                                          argument.addOption(key, desc);
+                                                     }
+                                                }
+                                          }
+                                     }
+                                     else if(node_name.equals("Required")) {
+                                          String v = MSMUtils.getValue(det);
+                                          ///ystem.err.println("Required = " + v);
+                                          if(v.equalsIgnoreCase("yes")) {
+                                                ///ystem.err.println("Setting required to true.");
+                                                argument.setRequired(true);
+                                          }
+                                     }
+                                }
+                                classifier.addArgument(argument);
+                          }
+                          // A super classifier class.
+                          else if(node_name.equals("ClasInfo")) {
+                                Classifier super_classifier = parse(arg);
+                                classifier.setSuper(super_classifier);
+                          }
+                     }
+                }
+          }
+          if(classifier.getName() != null) {
+                addClassifier(classifier);
+                return classifier;
+          }
+          return null;
+     }
+     /** A class which provides controls for assigned and editing classifiers. */
+     private class Control
+          extends JPanel {
+          /** Button for adding classifiers. */
+          private JButton add = null;
+          /** Button for configuring the selected classifier. */
+          private JButton configure = null;
+          /** Button to remove the selected classifier. */
+          private JButton remove = null;
+          /** A combobox containing all of the known classifiers, including those that may have already been assigned. */
+          private JComboBox classifier = null;
+          /** A list of assigned classifiers. */
+          private JList classifier_list = null;
+          /** The text area containing instructions on the use of this control. */
+          private JTextArea instructions = null;
+          /** Constructor.
+            * @see org.greenstone.gatherer.cdm.ClassifierManager.Control.AddListener
+            * @see org.greenstone.gatherer.cdm.ClassifierManager.Control.ConfigureListener
+            * @see org.greenstone.gatherer.cdm.ClassifierManager.Control.RemoveListener
+                }
+            }
+            classifier.addArgument(argument);
+            }
+            // A super classifier class.
+            else if(node_name.equals("ClasInfo")) {
+            Classifier super_classifier = parse(arg);
+            classifier.setSuper(super_classifier);
+            }
+        }
+        }
+    }
+    if(classifier.getName() != null) {
+        addClassifier(classifier);
+        return classifier;
+    }
+    return null;
+    }
+    /** A class which provides controls for assigned and editing classifiers. */
+    private class Control
+    extends JPanel {
+    /** Button for adding classifiers. */
+    private JButton add = null;
+    /** Button for configuring the selected classifier. */
+    private JButton configure = null;
+    /** Button to remove the selected classifier. */
+    private JButton remove = null;
+    /** A combobox containing all of the known classifiers, including those that may have already been assigned. */
+    private JComboBox classifier = null;
+    /** A list of assigned classifiers. */
+    private JList classifier_list = null;
+    /** The text area containing instructions on the use of this control. */
+    private JTextArea instructions = null;
+    /** Constructor.
+     * @see org.greenstone.gatherer.cdm.ClassifierManager.Control.AddListener
+     * @see org.greenstone.gatherer.cdm.ClassifierManager.Control.ConfigureListener
+     * @see org.greenstone.gatherer.cdm.ClassifierManager.Control.RemoveListener
+     */
+    public Control() {
+        Object classifiers[] = reserve.toArray();
+        ArrayList classifier_model = new ArrayList();
+        for(int i = 0; i < classifiers.length; i++) {
+        classifier_model.add(((Classifier)classifiers[i]).getName());
+        }
+                // Now we add custom classifiers.
+        addCustomClassifiers(classifier_model);
+        Collections.sort(classifier_model);
+                // Create
+        add = new JButton(get("Add"));
+        JPanel button_pane = new JPanel();
+        JPanel central_pane = new JPanel();
+        configure = new JButton(get("Configure"));
+        JPanel header_pane = new JPanel();
+        instructions = new JTextArea(get("Instructions"));
+        instructions.setBackground(Gatherer.config.getColor("coloring.collection_tree_background", false));
+        instructions.setEditable(false);
+        instructions.setLineWrap(true);
+        instructions.setRows(5);
+        instructions.setWrapStyleWord(true);
+        classifier = new JComboBox(classifier_model.toArray());
+        classifier.setEditable(true);
+        JLabel classifier_label = new JLabel(get("Classifier"));
+        classifier_list = new JList(assigned);
+        JLabel classifier_list_label = new JLabel(get("Assigned"));
+        classifier_list_label.setHorizontalAlignment(JLabel.CENTER);
+        classifier_list_label.setOpaque(true);
+        JPanel classifier_list_pane = new JPanel();
+        JPanel classifier_pane = new JPanel();
+        remove = new JButton(get("Remove"));
+        JLabel title = new JLabel(get("Title"));
+        title.setHorizontalAlignment(JLabel.CENTER);
+        title.setOpaque(true);
+        JPanel temp = new JPanel(new BorderLayout());
+                // Listeners
+        add.addActionListener(new AddListener());
+        configure.addActionListener(new ConfigureListener());
+        remove.addActionListener(new RemoveListener());
+        classifier_list.addMouseListener(new ClickListener());
+                // Layout
+        title.setBorder(BorderFactory.createEmptyBorder(0,0,2,0));
+        instructions.setBorder(BorderFactory.createEmptyBorder(2,5,2,5));
+        header_pane.setLayout(new BorderLayout());
+        header_pane.add(title, BorderLayout.NORTH);
+        header_pane.add(new JScrollPane(instructions), BorderLayout.CENTER);
+        classifier_list_label.setBorder(BorderFactory.createEmptyBorder(0,2,0,2));
+        classifier_list_pane.setLayout(new BorderLayout());
+        classifier_list_pane.add(classifier_list_label, BorderLayout.NORTH);
+        classifier_list_pane.add(new JScrollPane(classifier_list), BorderLayout.CENTER);
+        classifier_label.setBorder(BorderFactory.createEmptyBorder(0,0,5,0));
+        classifier_pane.setBorder(BorderFactory.createEmptyBorder(5,0,5,0));
+        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.add(add);
+        button_pane.add(configure);
+        button_pane.add(remove);
+                // Scope these mad bordering skillz.
+        temp.setBorder(BorderFactory.createCompoundBorder(BorderFactory.createEmptyBorder(5,0,5,0), BorderFactory.createCompoundBorder(BorderFactory.createTitledBorder(get("Controls")), BorderFactory.createEmptyBorder(2,2,2,2))));
+        temp.add(classifier_pane, BorderLayout.NORTH);
+        temp.add(button_pane, BorderLayout.SOUTH);
+        central_pane.setLayout(new BorderLayout());
+        central_pane.add(classifier_list_pane, BorderLayout.CENTER);
+        central_pane.add(temp, BorderLayout.SOUTH);
+        setBorder(BorderFactory.createEmptyBorder(5,5,5,5));
+        setLayout(new BorderLayout());
+        add(header_pane, BorderLayout.NORTH);
+        add(central_pane, BorderLayout.CENTER);
+    }
+    /** Method which acts like a destructor, tidying up references to persistant objects.
             */
+          public Control() {
+                Object classifiers[] = reserve.toArray();
+                ArrayList classifier_model = new ArrayList();
+                for(int i = 0; i < classifiers.length; i++) {
+                     classifier_model.add(((Classifier)classifiers[i]).getName());
+                }
+                // Now we add custom classifiers.
+                addCustomClassifiers(classifier_model);
+                Collections.sort(classifier_model);
+                // Create
+                add = new JButton(get("Add"));
+                JPanel button_pane = new JPanel();
+                JPanel central_pane = new JPanel();
+                configure = new JButton(get("Configure"));
+                JPanel header_pane = new JPanel();
+                instructions = new JTextArea(get("Instructions"));
+                instructions.setBackground(Gatherer.config.getColor("coloring.collection_tree_background", false));
+                instructions.setEditable(false);
+                instructions.setLineWrap(true);
+                instructions.setRows(5);
+                instructions.setWrapStyleWord(true);
+                classifier = new JComboBox(classifier_model.toArray());
+                classifier.setEditable(true);
+                JLabel classifier_label = new JLabel(get("Classifier"));
+                classifier_list = new JList(assigned);
+                JLabel classifier_list_label = new JLabel(get("Assigned"));
+                classifier_list_label.setHorizontalAlignment(JLabel.CENTER);
+                classifier_list_label.setOpaque(true);
+                JPanel classifier_list_pane = new JPanel();
+                JPanel classifier_pane = new JPanel();
+                remove = new JButton(get("Remove"));
+                JLabel title = new JLabel(get("Title"));
+                title.setHorizontalAlignment(JLabel.CENTER);
+                title.setOpaque(true);
+                JPanel temp = new JPanel(new BorderLayout());
+                // Listeners
+                add.addActionListener(new AddListener());
+                configure.addActionListener(new ConfigureListener());
+                remove.addActionListener(new RemoveListener());
+                classifier_list.addMouseListener(new ClickListener());
+                // Layout
+                title.setBorder(BorderFactory.createEmptyBorder(0,0,2,0));
+                instructions.setBorder(BorderFactory.createEmptyBorder(2,5,2,5));
+                header_pane.setLayout(new BorderLayout());
+                header_pane.add(title, BorderLayout.NORTH);
+                header_pane.add(new JScrollPane(instructions), BorderLayout.CENTER);
+                classifier_list_label.setBorder(BorderFactory.createEmptyBorder(0,2,0,2));
+                classifier_list_pane.setLayout(new BorderLayout());
+                classifier_list_pane.add(classifier_list_label, BorderLayout.NORTH);
+                classifier_list_pane.add(new JScrollPane(classifier_list), BorderLayout.CENTER);
+                classifier_label.setBorder(BorderFactory.createEmptyBorder(0,0,5,0));
+                classifier_pane.setBorder(BorderFactory.createEmptyBorder(5,0,5,0));
+                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.add(add);
+                button_pane.add(configure);
+                button_pane.add(remove);
+                // Scope these mad bordering skillz.
+                temp.setBorder(BorderFactory.createCompoundBorder(BorderFactory.createEmptyBorder(5,0,5,0), BorderFactory.createCompoundBorder(BorderFactory.createTitledBorder(get("Controls")), BorderFactory.createEmptyBorder(2,2,2,2))));
+                temp.add(classifier_pane, BorderLayout.NORTH);
+                temp.add(button_pane, BorderLayout.SOUTH);
+                central_pane.setLayout(new BorderLayout());
+                central_pane.add(classifier_list_pane, BorderLayout.CENTER);
+                central_pane.add(temp, BorderLayout.SOUTH);
+                setBorder(BorderFactory.createEmptyBorder(5,5,5,5));
+                setLayout(new BorderLayout());
+                add(header_pane, BorderLayout.NORTH);
+                add(central_pane, BorderLayout.CENTER);
+          }
+          /** Method which acts like a destructor, tidying up references to persistant objects.
+    public void destroy() {
+        add = null;
+        classifier = null;
+        classifier_list = null;
+        configure = null;
+        instructions = null;
+        remove = null;
+    }
+    /** This method is overridden to ensure the instructions are scrolled to top, before the super classes updateUI() is called.
             */
+          public void destroy() {
+                add = null;
+                classifier = null;
+                classifier_list = null;
+                configure = null;
+                instructions = null;
+                remove = null;
+          }
+          /** This method is overridden to ensure the instructions are scrolled to top, before the super classes updateUI() is called.
+            */
+          public void updateUI() {
+                if(instructions != null) {
+                     instructions.setCaretPosition(0);
+                }
+                super.updateUI();
+          }
+          /** Searches and adds a list of dynamically located CustomClassifiers. Note that the classes must be located under org.greenstone.gatherer.cdm.custom and have accompaning properties files which are used as dictionaries.
+    public void updateUI() {
+        if(instructions != null) {
+        instructions.setCaretPosition(0);
+        }
+        super.updateUI();
+    }
+    /** Searches and adds a list of dynamically located CustomClassifiers. Note that the classes must be located under org.greenstone.gatherer.cdm.custom and have accompaning properties files which are used as dictionaries.
             * @param classifier_model An <strong>ArrayList</strong> which will be used as the model for the combobox listing all known Classifiers.
             */
           private void addCustomClassifiers(ArrayList classifier_model) {
+    private void addCustomClassifiers(ArrayList classifier_model) {
                 //classifier_model.add("CustomAZList");
                 // Search for classifiers under the org.greenstone.gatherer.cdm.custom directory.
                 File custom_directory = new File(Utility.BASE_DIR + "classes" + File.separator + "org" + File.separator + "greenstone" + File.separator + "gatherer" + File.separator + "cdm" + File.separator + "custom");
                 if(custom_directory.exists()) {
                      File children[] = custom_directory.listFiles();
                      for(int i = 0; i < children.length; i++) {
                           String temp = children[i].getName().toLowerCase();
                           // There are a whole bunch of conditions about what files are custom classifier main classes.
                           if(temp.endsWith(".class") && temp.indexOf("$") == -1) {
                                 // Determine the name of this custom classifier.
                                 String name = children[i].getName();
                                 name = name.substring(0, name.indexOf("."));
                                 classifier_model.add(name);
+                          }
+                     }
+                }
+        File custom_directory = new File(Utility.BASE_DIR + "classes" + File.separator + "org" + File.separator + "greenstone" + File.separator + "gatherer" + File.separator + "cdm" + File.separator + "custom");
+        if(custom_directory.exists()) {
+        File children[] = custom_directory.listFiles();
+        for(int i = 0; i < children.length; i++) {
+            String temp = children[i].getName().toLowerCase();
+            // There are a whole bunch of conditions about what files are custom classifier main classes.
+            if(temp.endsWith(".class") && temp.indexOf("$") == -1) {
+            // Determine the name of this custom classifier.
+            String name = children[i].getName();
+            name = name.substring(0, name.indexOf("."));
+            classifier_model.add(name);
+            }
+        }
+        }
                 // Search for any other CustomClassifiers within the jar file (if present)
                 File jar_file = new File("Gatherer.jar");
                 if(jar_file.exists()) {
                      try {
                           JarFile jar = new JarFile(jar_file);
                           for(Enumeration entries = jar.entries(); entries.hasMoreElements(); ) {
                                 String name = entries.nextElement().toString();
                                 if(name.startsWith("org/greenstone/gatherer/cdm/custom/") && name.endsWith(".class") && name.indexOf("$") == -1) {
                                      name = name.substring(35, name.length() - 6);
                                      if(!classifier_model.contains(name)) {
                                           classifier_model.add(name);
+                                     }
+                                }
                                 name = null;
+                          }
                           jar = null;
+                     }
                      catch (Exception error) {
                           error.printStackTrace();
+                     }
+                }
                 jar_file = null;
+          }
           /** This class listens for actions upon the add button in the controls, and if detected calls the assignClassifier() method.
+        File jar_file = new File("Gatherer.jar");
+        if(jar_file.exists()) {
+        try {
+            JarFile jar = new JarFile(jar_file);
+            for(Enumeration entries = jar.entries(); entries.hasMoreElements(); ) {
+            String name = entries.nextElement().toString();
+            if(name.startsWith("org/greenstone/gatherer/cdm/custom/") && name.endsWith(".class") && name.indexOf("$") == -1) {
+                name = name.substring(35, name.length() - 6);
+                if(!classifier_model.contains(name)) {
+                classifier_model.add(name);
+                }
+            }
+            name = null;
+            }
+            jar = null;
+        }
+        catch (Exception error) {
+            error.printStackTrace();
+        }
+        }
+        jar_file = null;
+    }
+    /** This class listens for actions upon the add button in the controls, and if detected calls the assignClassifier() method.
             */
           private class AddListener
                 implements ActionListener {
+    private class AddListener
+        implements ActionListener {
                 /** Any implementation of ActionListener must include this method so that we can be informed when an action has occured on one of our target controls, so that we can add the selected Classifier.
                  * @param event An <strong>ActionEvent</strong> containing information garnered from the control action.
 …
                  * @see org.greenstone.gatherer.cdm.CustomClassifier
                  */
                 public void actionPerformed(ActionEvent event) {
                      String name = (String)classifier.getSelectedItem();
                      Classifier target = getClassifier(name);
                      Classifier classifier = null;
                      CustomClassifier custom_classifier = null;
                      if(target != null) {
                           classifier = target.copy();
+                     }
                      else {
                           // Try to retrieve custom classifier for name.
                           try {
                                 Class custom_class = Class.forName("org.greenstone.gatherer.cdm.custom." + name);
                                 custom_classifier = (CustomClassifier)custom_class.newInstance();
                                 custom_classifier.setGatherer(gatherer);
+                          }
                           catch (Exception error) {
                                 gatherer.debug(error, "Error in ClassifierManager.AddListener.actionPerformed(): " + error);
+                          }
                           // And if all else fails create a new classifier.
                           if(classifier == null && custom_classifier == null) {
                                 classifier = new Classifier(name, "", null);
+                          }
+                     }
                      if(classifier != null) {
                           // Automatically chain to configuration. This ensures required arguments are filled out.
                           ArgumentConfiguration ac = new ArgumentConfiguration(gatherer, manager, classifier);
                           if(ac.display()) {
                                 assignClassifier(classifier);
+                          }
                           ac.destroy();
                           ac = null;
+                     }
                      // Custom classifier
                      else {
                           if(custom_classifier.display(true)) {
                                 assignClassifier(custom_classifier);
+                          }
                           custom_classifier.destroy(); // Remove gui prompt or else.
                           custom_classifier = null;
+                     }
+                }
+          }
           /** Listens for double clicks apon the list and react as if the configure button was pushed. */
           private class ClickListener
                 extends MouseAdapter {
+        public void actionPerformed(ActionEvent event) {
+        String name = (String)classifier.getSelectedItem();
+        Classifier target = getClassifier(name);
+        Classifier classifier = null;
+        CustomClassifier custom_classifier = null;
+        if(target != null) {
+            classifier = target.copy();
+        }
+        else {
+            // Try to retrieve custom classifier for name.
+            try {
+            Class custom_class = Class.forName("org.greenstone.gatherer.cdm.custom." + name);
+            custom_classifier = (CustomClassifier)custom_class.newInstance();
+            custom_classifier.setGatherer(gatherer);
+            }
+            catch (Exception error) {
+            gatherer.debug(error, "Error in ClassifierManager.AddListener.actionPerformed(): " + error);
+            }
+            // And if all else fails create a new classifier.
+            if(classifier == null && custom_classifier == null) {
+            classifier = new Classifier(name, "", null);
+            }
+        }
+        if(classifier != null) {
+            // Automatically chain to configuration. This ensures required arguments are filled out.
+            ArgumentConfiguration ac = new ArgumentConfiguration(gatherer, manager, classifier);
+            if(ac.display()) {
+            assignClassifier(classifier);
+            }
+            ac.destroy();
+            ac = null;
+        }
+        // Custom classifier
+        else {
+            if(custom_classifier.display(true)) {
+            assignClassifier(custom_classifier);
+            }
+            custom_classifier.destroy(); // Remove gui prompt or else.
+            custom_classifier = null;
+        }
+        }
+    }
+    /** Listens for double clicks apon the list and react as if the configure button was pushed. */
+    private class ClickListener
+        extends MouseAdapter {
                 /** Called whenever the mouse is clicked over a registered component, we use this to chain through to the configure prompt.
                  * @param event A <strong>MouseEvent</strong> containing information about the mouse click.
                  */
                 public void mouseClicked(MouseEvent event) {
                      if(event.getClickCount() == 2 ) {
                           if(!classifier_list.isSelectionEmpty()) {
                                 Object object = classifier_list.getSelectedValue();
                                 if(object instanceof Classifier) {
                                      ArgumentConfiguration ac = new ArgumentConfiguration(gatherer, manager, (Classifier)object);
                                      if(ac.display()) {
                                           assigned.refresh();
+                                     }
                                      ac.destroy();
                                      ac = null;
+                                }
                                 else if(object instanceof CustomClassifier) {
                                      CustomClassifier cc = (CustomClassifier)object;
                                      if(cc.display(true)) {
                                           assigned.refresh();
+                                     }
                                      cc.destroy(); // Remove gui prompt or else.
                                      cc = null;
+                                }
+                          }
+                     }
+                }
+          }
           /** This class listens for actions upon the configure button in the controls, and if detected creates a new ArgumentConfiguration dialog box to allow for configuration.
+        public void mouseClicked(MouseEvent event) {
+        if(event.getClickCount() == 2 ) {
+            if(!classifier_list.isSelectionEmpty()) {
+            Object object = classifier_list.getSelectedValue();
+            if(object instanceof Classifier) {
+                ArgumentConfiguration ac = new ArgumentConfiguration(gatherer, manager, (Classifier)object);
+                if(ac.display()) {
+                assigned.refresh();
+                }
+                ac.destroy();
+                ac = null;
+            }
+            else if(object instanceof CustomClassifier) {
+                CustomClassifier cc = (CustomClassifier)object;
+                if(cc.display(true)) {
+                assigned.refresh();
+                }
+                cc.destroy(); // Remove gui prompt or else.
+                cc = null;
+            }
+            }
+        }
+        }
+    }
+    /** This class listens for actions upon the configure button in the controls, and if detected creates a new ArgumentConfiguration dialog box to allow for configuration.
             */
           private class ConfigureListener
                 implements ActionListener {
+    private class ConfigureListener
+        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.
 …
                  * @see org.greenstone.gatherer.cdm.CustomClassifier
                  */
                 public void actionPerformed(ActionEvent event) {
                      if(!classifier_list.isSelectionEmpty()) {
                           Object object = classifier_list.getSelectedValue();
                           if(object instanceof Classifier) {
                                 ArgumentConfiguration ac = new ArgumentConfiguration(gatherer, manager, (Classifier)object);
                                 if(ac.display()) {
                                      assigned.refresh();
+                                }
                                 ac.destroy();
                                 ac = null;
+                          }
                           else if(object instanceof CustomClassifier) {
                                 CustomClassifier cc = (CustomClassifier)object;
                                 if(cc.display(true)) {
                                      assigned.refresh();
+                                }
                                 cc.destroy(); // Remove gui prompt or else.
                                 cc = null;
+                          }
+                     }
+                }
+          }
           /** This class listens for actions upon the remove button in the controls, and if detected calls the removeClassifier() method.
+        public void actionPerformed(ActionEvent event) {
+        if(!classifier_list.isSelectionEmpty()) {
+            Object object = classifier_list.getSelectedValue();
+            if(object instanceof Classifier) {
+            ArgumentConfiguration ac = new ArgumentConfiguration(gatherer, manager, (Classifier)object);
+            if(ac.display()) {
+                assigned.refresh();
+            }
+            ac.destroy();
+            ac = null;
+            }
+            else if(object instanceof CustomClassifier) {
+            CustomClassifier cc = (CustomClassifier)object;
+            if(cc.display(true)) {
+                assigned.refresh();
+            }
+            cc.destroy(); // Remove gui prompt or else.
+            cc = null;
+            }
+        }
+        }
+    }
+    /** This class listens for actions upon the remove button in the controls, and if detected calls the removeClassifier() method.
             */
           private class RemoveListener
                 implements ActionListener {
+    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.CustomClassifier
                  */
                 public void actionPerformed(ActionEvent event) {
                      if(!classifier_list.isSelectionEmpty()) {
                           Object object = classifier_list.getSelectedValue();
                           if(object instanceof Classifier || object instanceof CustomClassifier) {
                                 removeClassifier(object);
+                          }
+                     }
+                }
+          }
+     }
+        public void actionPerformed(ActionEvent event) {
+        if(!classifier_list.isSelectionEmpty()) {
+            Object object = classifier_list.getSelectedValue();
+            if(object instanceof Classifier || object instanceof CustomClassifier) {
+            removeClassifier(object);
+            }
+        }
+        }
+    }
+    }
+}

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

-              r4293
+              r4366
 // ####################################################################################
 public class CollectionDesignManager {
      /** Whether this collection is to be made public or not. */
      public boolean public_col = false;
      /** Whether this collection is a beta version or not. */
      public boolean beta = true;
      /** A list of classifiers to use at build time. */
      public ClassifierManager classifiers = null;
      /** A manager of collection level metadata. */
      public CollectionMetaManager collectionmetadatum = null;
      /** E-mail address of the collection's creator. */
      public EmailAddress creator = null;
      /** E-mail address of the collection's maintainer. */
      public EmailAddress maintainer = null;
      /** The collection configuration file. */
      public File in_file = null;
      /** A list of formating strings to use at build time. */
      public FormatManager formats = null;
      /** The manager in charge of displaying this manager and the controls for other managers. */
      public GUI gui = null;
      /** List of indexes to be built, and the default index. */
      public IndexManager indexes = null;
      /** Contains instructions dealing with the collection language. */
      public LanguageManager languages = null;
      /** A simple manager for the visual review of metadata sets. */
      public MetadataSetManager metadatasets = null;
      /** A list of plugins to use at build time. */
      public PlugInManager plugins = null;
      /** Contains: A list of subcollections, (defined on metadatadata), a list of which subcollection indexes to build and the default subcollection index. */
      public SubcollectionManager subcollections = null;
      /** A list of whatever commands could not be parsed at all. */
      private ArrayList rest = null;
      /** A reference to the Gatherer. */
      private Gatherer gatherer = null;
      /** Constructor.
       * @param gatherer The <strong>Gatherer</strong> that created this class.
       * @see org.greenstone.gatherer.cdm.ClassifierManager
       * @see org.greenstone.gatherer.cdm.CollectionMetaManager
       * @see org.greenstone.gatherer.cdm.FormatManager
       * @see org.greenstone.gatherer.cdm.IndexManager
       * @see org.greenstone.gatherer.cdm.LanguageManager
       * @see org.greenstone.gatherer.cdm.MetadataSetManager
       * @see org.greenstone.gatherer.cdm.PlugInManager
       * @see org.greenstone.gatherer.cdm.SubcollectionManager
       */
      public CollectionDesignManager() {
           this.gatherer = Gatherer.self;
           this.classifiers = new ClassifierManager(gatherer, this);
           this.collectionmetadatum = new CollectionMetaManager(gatherer, this);
           this.formats = new FormatManager(gatherer, this);
           this.indexes = new IndexManager(gatherer, this);
           this.languages = new LanguageManager(gatherer, this);
           this.metadatasets = new MetadataSetManager(gatherer);
           this.plugins = new PlugInManager(gatherer, this);
           this.rest = new ArrayList();
           this.subcollections = new SubcollectionManager(gatherer);
+     }
      /** In order to prevent Components that have registered themselves wasting memory, this method invalidates each of the sub-managers controls, causing them to unregister listeners.
       * @see org.greenstone.gatherer.cdm.ClassifierManager
       * @see org.greenstone.gatherer.cdm.CollectionMetaManager
       * @see org.greenstone.gatherer.cdm.FormatManager
       * @see org.greenstone.gatherer.cdm.IndexManager
       * @see org.greenstone.gatherer.cdm.LanguageManager
       * @see org.greenstone.gatherer.cdm.MetadataSetManager
       * @see org.greenstone.gatherer.cdm.PlugInManager
       * @see org.greenstone.gatherer.cdm.SubcollectionManager
       */
      public void destroy() {
           // Remove visual the component from its parent.
           if(gui.getParent() != null) {
                 gui.getParent().remove(gui);
+          }
           // Remove references from persistant listeners.
           if(classifiers != null && formats != null && gui != null && indexes != null && languages != null && metadatasets != null && plugins != null && subcollections != null) {
                 classifiers.invalidateControls();
                 formats.invalidateControls();
                 gui.invalidateControls();
                 indexes.invalidateControls();
                 languages.invalidateControls();
                 metadatasets.invalidateControls();
                 plugins.invalidateControls();
                 subcollections.invalidateControls();
+          }
           // Null globals.
           classifiers = null;
           collectionmetadatum = null;
           creator = null;
           maintainer = null;
           in_file = null;
           formats = null;
           gui = null;
           indexes = null;
           languages = null;
           metadatasets = null;
           plugins = null;
           subcollections = null;
           rest = null;
           gatherer = null;
+     }
      /** Display the GUI interface for the CollectionDesignManager in the centre of the indicated panel.
       * @param target The <strong>JPanel</strong> you wish to display the GUI on.
       * @see org.greenstone.gatherer.cdm.GUI
       */
      public void display(JPanel target) {
          this.gui = new GUI(gatherer, this);
          target.add(gui, BorderLayout.CENTER);
+     }
      /** When the tab on the JTabbedPane that contains the GUI is selected, this method is called to ensure that the controls are all up to date, in terms of references to metadata etc.
       * @see org.greenstone.gatherer.cdm.GUI
       */
      public void gainFocus() {
           gui.updateUI();
+     }
      /** Retrieve the current set of indexes as defined by the user configuration.
       * @return An <strong>ArrayList</strong> of indexes.
       * @see org.greenstone.gatherer.cdm.Index
       * @see org.greenstone.gatherer.cdm.IndexManager
       */
      public ArrayList getIndexes() {
           ArrayList result = new ArrayList();
           int size = indexes.size();
           for(int i = 0; i < size; i++) {
                 result.add(indexes.getIndex(i));
+          }
           return result;
+     }
      /** Retrieve the name of the collection configuration file which is being used as the source of the information in this object.
       * @return The files absolute path as a <strong>String</strong>.
       */
      public String getFilename() {
           return in_file.getAbsolutePath();
+     }
      /** Used to parse the given file as if it was a collection configuration file, passing any parsed commands to the relevant submanager. Currently ignores any comments, and marks any other lines as being unrecognizable if they can't be parsed.
       * @param filename The name of the file you wish to attempt to pass as a <strong>String</strong>.
       * @see org.greenstone.gatherer.cdm.ClassifierManager
       * @see org.greenstone.gatherer.cdm.CollectionMetaManager
       * @see org.greenstone.gatherer.cdm.FormatManager
       * @see org.greenstone.gatherer.cdm.IndexManager
       * @see org.greenstone.gatherer.cdm.LanguageManager
       * @see org.greenstone.gatherer.cdm.MetadataSetManager
       * @see org.greenstone.gatherer.cdm.PlugInManager
       * @see org.greenstone.gatherer.cdm.SubcollectionManager
       * @see org.greenstone.gatherer.util.EmailAddress
       */
      public void parse(String filename) {
           try {
                 in_file = new File(filename);
                 FileReader in_reader = new FileReader(in_file);
                 BufferedReader in = new BufferedReader(in_reader);
                 String command = null;
                 while((command = in.readLine()) != null) {
                      if(command.length() > 0) {
                           // We have to test the end of command for the special character '\'. If found, remove it and append the next line, then repeat.
                           while(command.trim().endsWith("\\")) {
                                 command = command.substring(0, command.lastIndexOf("\\"));
                                 String next_line = in.readLine();
                                 if(next_line != null) {
                                      command = command + next_line;
+                                }
+                          }
                           // Now we've finished parsing a command line, see what manager wants a piece of it.
                           boolean found = false;
                           String command_lc = command.toLowerCase();
                           if(command_lc.startsWith("creator")) {
                                 creator = new EmailAddress(gatherer, command);
                                 found = true;
+                          }
                           if(command_lc.startsWith("maintainer")) {
                                 maintainer = new EmailAddress(gatherer, command);
                                 found = true;
+                          }
                           if(command_lc.startsWith("public")) {
                                 if(command_lc.endsWith("true")) {
                                      public_col = true;
+                                }
                                 else {
                                      public_col = false;
+                                }
                                 found = true;
+                          }
                           if(command_lc.startsWith("beta")) {
                                 if(command_lc.endsWith("false")) {
                                      beta = false;
+                                }
                                 else {
                                      beta = true;
+                                }
                                 found = true;
+                          }
                           if(!found) {
                                 found = indexes.parse(command);
+                          }
                           if(!found) {
                                 found = subcollections.parse(command, false);
+                          }
                           if(!found) {
                                 found = languages.parse(command);
+                          }
                           if(!found) {
                                 found = plugins.parse(command);
+                          }
                           if(!found) {
                                 found = classifiers.parse(command);
+                          }
                           if(!found) {
                                 found = formats.parse(command, false);
+                          }
                           if(!found) {
                                 found = collectionmetadatum.parse(command, false);
+                          }
                           // Metadataset commands
                           if(command_lc.startsWith("metadataset")) {
                                 // Nothing yet. Eventually used to import metadata.
                                 found = true;
+                          }
                           // Comments we ignore.
                           if(command_lc.startsWith("# these instructions are not recognized by the gatherer.")) {
                                 // Ignore
                                 found = true;
+                          }
                           // We have been unable to parse this command, add it to rest.
                           if(!found) {
                                 rest.add(command);
+                          }
+                     }
+                }
                 in.close();
+    /** Whether this collection is to be made public or not. */
+    public boolean public_col = false;
+    /** Whether this collection is a beta version or not. */
+    public boolean beta = true;
+    /** A list of classifiers to use at build time. */
+    public ClassifierManager classifiers = null;
+    /** A manager of collection level metadata. */
+    public CollectionMetaManager collectionmetadatum = null;
+    /** E-mail address of the collection's creator. */
+    public EmailAddress creator = null;
+    /** E-mail address of the collection's maintainer. */
+    public EmailAddress maintainer = null;
+    /** The collection configuration file. */
+    public File in_file = null;
+    /** A list of formating strings to use at build time. */
+    public FormatManager formats = null;
+    /** The manager in charge of displaying this manager and the controls for other managers. */
+    public GUI gui = null;
+    /** List of indexes to be built, and the default index. */
+    public IndexManager indexes = null;
+    /** Contains instructions dealing with the collection language. */
+    public LanguageManager languages = null;
+    /** A simple manager for the visual review of metadata sets. */
+    public MetadataSetManager metadatasets = null;
+    /** A list of plugins to use at build time. */
+    public PlugInManager plugins = null;
+    /** Contains: A list of subcollections, (defined on metadatadata), a list of which subcollection indexes to build and the default subcollection index. */
+    public SubcollectionManager subcollections = null;
+    /** A list of whatever commands could not be parsed at all. */
+    private ArrayList rest = null;
+    /** A reference to the Gatherer. */
+    private Gatherer gatherer = null;
+    /** Constructor.
+     * @param gatherer The <strong>Gatherer</strong> that created this class.
+     * @see org.greenstone.gatherer.cdm.ClassifierManager
+     * @see org.greenstone.gatherer.cdm.CollectionMetaManager
+     * @see org.greenstone.gatherer.cdm.FormatManager
+     * @see org.greenstone.gatherer.cdm.IndexManager
+     * @see org.greenstone.gatherer.cdm.LanguageManager
+     * @see org.greenstone.gatherer.cdm.MetadataSetManager
+     * @see org.greenstone.gatherer.cdm.PlugInManager
+     * @see org.greenstone.gatherer.cdm.SubcollectionManager
+     */
+    public CollectionDesignManager() {
+    this.gatherer = Gatherer.self;
+    this.classifiers = new ClassifierManager(gatherer, this);
+    this.collectionmetadatum = new CollectionMetaManager(gatherer, this);
+    this.formats = new FormatManager(gatherer, this);
+    this.indexes = new IndexManager(gatherer, this);
+    this.languages = new LanguageManager(gatherer, this);
+    this.metadatasets = new MetadataSetManager(gatherer);
+    this.plugins = new PlugInManager(gatherer, this);
+    this.rest = new ArrayList();
+    this.subcollections = new SubcollectionManager(gatherer);
+    }
+    /** In order to prevent Components that have registered themselves wasting memory, this method invalidates each of the sub-managers controls, causing them to unregister listeners.
+     * @see org.greenstone.gatherer.cdm.ClassifierManager
+     * @see org.greenstone.gatherer.cdm.CollectionMetaManager
+     * @see org.greenstone.gatherer.cdm.FormatManager
+     * @see org.greenstone.gatherer.cdm.IndexManager
+     * @see org.greenstone.gatherer.cdm.LanguageManager
+     * @see org.greenstone.gatherer.cdm.MetadataSetManager
+     * @see org.greenstone.gatherer.cdm.PlugInManager
+     * @see org.greenstone.gatherer.cdm.SubcollectionManager
+     */
+    public void destroy() {
+    // Remove visual the component from its parent.
+    if(gui.getParent() != null) {
+        gui.getParent().remove(gui);
+    }
+    // Remove references from persistant listeners.
+    if(classifiers != null && formats != null && gui != null && indexes != null && languages != null && metadatasets != null && plugins != null && subcollections != null) {
+        classifiers.invalidateControls();
+        formats.invalidateControls();
+        gui.invalidateControls();
+        indexes.invalidateControls();
+        languages.invalidateControls();
+        metadatasets.invalidateControls();
+        plugins.invalidateControls();
+        subcollections.invalidateControls();
+    }
+    // Null globals.
+    classifiers = null;
+    collectionmetadatum = null;
+    creator = null;
+    maintainer = null;
+    in_file = null;
+    formats = null;
+    gui = null;
+    indexes = null;
+    languages = null;
+    metadatasets = null;
+    plugins = null;
+    subcollections = null;
+    rest = null;
+    gatherer = null;
+    }
+    /** Display the GUI interface for the CollectionDesignManager in the centre of the indicated panel.
+     * @param target The <strong>JPanel</strong> you wish to display the GUI on.
+     * @see org.greenstone.gatherer.cdm.GUI
+     */
+    public void display(JPanel target) {
+    this.gui = new GUI(gatherer, this);
+    target.add(gui, BorderLayout.CENTER);
+    }
+    /** When the tab on the JTabbedPane that contains the GUI is selected, this method is called to ensure that the controls are all up to date, in terms of references to metadata etc.
+     * @see org.greenstone.gatherer.cdm.GUI
+     */
+    public void gainFocus() {
+    gui.updateUI();
+    }
+    /** Retrieve the current set of indexes as defined by the user configuration.
+     * @return An <strong>ArrayList</strong> of indexes.
+     * @see org.greenstone.gatherer.cdm.Index
+     * @see org.greenstone.gatherer.cdm.IndexManager
+     */
+    public ArrayList getIndexes() {
+    ArrayList result = new ArrayList();
+    int size = indexes.size();
+    for(int i = 0; i < size; i++) {
+        result.add(indexes.getIndex(i));
+    }
+    return result;
+    }
+    /** Retrieve the name of the collection configuration file which is being used as the source of the information in this object.
+     * @return The files absolute path as a <strong>String</strong>.
+     */
+    public String getFilename() {
+    return in_file.getAbsolutePath();
+    }
+    /** Used to parse the given file as if it was a collection configuration file, passing any parsed commands to the relevant submanager. Currently ignores any comments, and marks any other lines as being unrecognizable if they can't be parsed.
+     * @param filename The name of the file you wish to attempt to pass as a <strong>String</strong>.
+     * @see org.greenstone.gatherer.cdm.ClassifierManager
+     * @see org.greenstone.gatherer.cdm.CollectionMetaManager
+     * @see org.greenstone.gatherer.cdm.FormatManager
+     * @see org.greenstone.gatherer.cdm.IndexManager
+     * @see org.greenstone.gatherer.cdm.LanguageManager
+     * @see org.greenstone.gatherer.cdm.MetadataSetManager
+     * @see org.greenstone.gatherer.cdm.PlugInManager
+     * @see org.greenstone.gatherer.cdm.SubcollectionManager
+     * @see org.greenstone.gatherer.util.EmailAddress
+     */
+    public void parse(String filename) {
+    try {
+        in_file = new File(filename);
+        FileReader in_reader = new FileReader(in_file);
+        BufferedReader in = new BufferedReader(in_reader);
+        String command = null;
+        while((command = in.readLine()) != null) {
+        if(command.length() > 0) {
+            // We have to test the end of command for the special character '\'. If found, remove it and append the next line, then repeat.
+            while(command.trim().endsWith("\\")) {
+            command = command.substring(0, command.lastIndexOf("\\"));
+            String next_line = in.readLine();
+            if(next_line != null) {
+                command = command + next_line;
+            }
+            }
+            // Now we've finished parsing a command line, see what manager wants a piece of it.
+            boolean found = false;
+            String command_lc = command.toLowerCase();
+            if(command_lc.startsWith("creator")) {
+            creator = new EmailAddress(gatherer, command);
+            found = true;
+            }
+            if(command_lc.startsWith("maintainer")) {
+            maintainer = new EmailAddress(gatherer, command);
+            found = true;
+            }
+            if(command_lc.startsWith("public")) {
+            if(command_lc.endsWith("true")) {
+                public_col = true;
+            }
+            else {
+                public_col = false;
+            }
+            found = true;
+            }
+            if(command_lc.startsWith("beta")) {
+            if(command_lc.endsWith("false")) {
+                beta = false;
+            }
+            else {
+                beta = true;
+            }
+            found = true;
+            }
+            if(!found) {
+            found = indexes.parse(command);
+            }
+            if(!found) {
+            found = subcollections.parse(command, false);
+            }
+            if(!found) {
+            found = languages.parse(command);
+            }
+            if(!found) {
+            found = plugins.parse(command);
+            }
+            if(!found) {
+            found = classifiers.parse(command);
+            }
+            if(!found) {
+            found = formats.parse(command, false);
+            }
+            if(!found) {
+            found = collectionmetadatum.parse(command, false);
+            }
+            // Metadataset commands
+            if(command_lc.startsWith("metadataset")) {
+            // Nothing yet. Eventually used to import metadata.
+            found = true;
+            }
+            // Comments we ignore.
+            if(command_lc.startsWith("# these instructions are not recognized by the gatherer.")) {
+            // Ignore
+            found = true;
+            }
+            // We have been unable to parse this command, add it to rest.
+            if(!found) {
+            rest.add(command);
+            }
+        }
+        }
+        in.close();
                 // Now attempt to finalize any commands that were not immediately parsed as they were waiting for unresolved references.
                 subcollections.reparseUnresolved();
                 classifiers.reparseUnresolved();
                 formats.reparseUnresolved();
                 collectionmetadatum.reparseUnresolved();
+          }
           catch(Exception error) {
                 error.printStackTrace();
+          }
+     }
      /** Cause the current definitions within the Collection Design Manager to be written back out to whatever collect.cfg it is based upon, taking care to change reference pointers into something more sensible within the text file.
       * @see org.greenstone.gatherer.cdm.ClassifierManager
       * @see org.greenstone.gatherer.cdm.CollectionMetaManager
       * @see org.greenstone.gatherer.cdm.FormatManager
       * @see org.greenstone.gatherer.cdm.IndexManager
       * @see org.greenstone.gatherer.cdm.LanguageManager
       * @see org.greenstone.gatherer.cdm.MetadataSetManager
       * @see org.greenstone.gatherer.cdm.PlugInManager
       * @see org.greenstone.gatherer.cdm.SubcollectionManager
       * @see org.greenstone.gatherer.util.EmailAddress
       */
      public void save() {
           try {
+        subcollections.reparseUnresolved();
+        classifiers.reparseUnresolved();
+        formats.reparseUnresolved();
+        collectionmetadatum.reparseUnresolved();
+    }
+    catch(Exception error) {
+        error.printStackTrace();
+    }
+    }
+    /** Cause the current definitions within the Collection Design Manager to be written back out to whatever collect.cfg it is based upon, taking care to change reference pointers into something more sensible within the text file.
+     * @see org.greenstone.gatherer.cdm.ClassifierManager
+     * @see org.greenstone.gatherer.cdm.CollectionMetaManager
+     * @see org.greenstone.gatherer.cdm.FormatManager
+     * @see org.greenstone.gatherer.cdm.IndexManager
+     * @see org.greenstone.gatherer.cdm.LanguageManager
+     * @see org.greenstone.gatherer.cdm.MetadataSetManager
+     * @see org.greenstone.gatherer.cdm.PlugInManager
+     * @see org.greenstone.gatherer.cdm.SubcollectionManager
+     * @see org.greenstone.gatherer.util.EmailAddress
+     */
+    public void save() {
+    try {
                 // If the file already exists (it should) rename it.
                 if(in_file.exists()) {
                      String filename = in_file.getAbsolutePath();
                      File backup = new File(filename + "~");
                      backup.deleteOnExit();
                      if(!in_file.renameTo(backup)) {
                           gatherer.debug("Error in CollectionDesignManager.parse(): FileRenamedException");
+                     }
                      in_file = new File(filename); // Just in case we moved it.
+                }
                 FileOutputStream out = new FileOutputStream(in_file);
                 StringBuffer text = new StringBuffer("");
                 if(creator != null) {
                      text.append(creator.toString());
                      text.append("\n");
+                }
                 if(maintainer != null) {
                      text.append(maintainer.toString());
                      text.append("\n");
+                }
                 if(public_col) {
                      text.append("public true\n");
+                }
                 else {
                      text.append("public false\n");
+                }
                 if(beta) {
                      text.append("beta true\n");
+                }
                 else {
                      text.append("beta false\n");
+                }
                 if(text.length() > 0) {
                      text.append("\n");
+                }
                 if(indexes.size() > 0) {
                      text.append(indexes.toString());
+                }
                 if(subcollections.size() > 0) {
                      text.append(subcollections.toString());
+                }
                 if(languages.size() > 0) {
                      text.append(languages.toString());
+                }
                 if(plugins.size() > 0) {
                      text.append(plugins.toString());
+                }
                 if(classifiers.size() > 0) {
                      text.append(classifiers.toString());
+                }
                 if(formats.size() > 0) {
                      text.append(formats.toString());
+                }
                 if(collectionmetadatum.size() > 0) {
                      text.append(collectionmetadatum.toString());
+                }
                 text.append(metadatasets.toString());
                 if(rest.size() > 0) {
                      // Write out rest at the bottom.
                      text.append("# These instructions are not recognized by the Gatherer.\n");
                      for(int i = 0; i < rest.size(); i++) {
                           text.append(rest.get(i));
                           text.append("\n");
+                     }
+                }
                 out.write(text.toString().getBytes());
                 out.close();
                 out = null;
+          }
           catch(Exception error) {
                 error.printStackTrace();
+          }
+     }
      /** Method used during a global search and replace to highlight the appropriate record within the Collection Design Managers version of the Metadata Set Manager (view only).
       * @param element The name of the desired element as a <strong>String</strong>.
       * @see org.greenstone.gatherer.cdm.GUI
       * @see org.greenstone.gatherer.cdm.MetadataSetManager
       */
      public Rectangle setSelectedElement(String element) {
           // First ensure that the metadata set controls are visible.
           gui.setSelectedView("CDM.GUI.MetadataSets");
           // Then tell them to select the given element.
           return metadatasets.setSelectedElement(element);
+     }
+        if(in_file.exists()) {
+        String filename = in_file.getAbsolutePath();
+        File backup = new File(filename + "~");
+        backup.deleteOnExit();
+        if(!in_file.renameTo(backup)) {
+            gatherer.debug("Error in CollectionDesignManager.parse(): FileRenamedException");
+        }
+        in_file = new File(filename); // Just in case we moved it.
+        }
+        FileOutputStream out = new FileOutputStream(in_file);
+        StringBuffer text = new StringBuffer("");
+        if(creator != null) {
+        text.append(creator.toString());
+        text.append("\n");
+        }
+        if(maintainer != null) {
+        text.append(maintainer.toString());
+        text.append("\n");
+        }
+        if(public_col) {
+        text.append("public true\n");
+        }
+        else {
+        text.append("public false\n");
+        }
+        if(beta) {
+        text.append("beta true\n");
+        }
+        else {
+        text.append("beta false\n");
+        }
+        if(text.length() > 0) {
+        text.append("\n");
+        }
+        if(indexes.size() > 0) {
+        text.append(indexes.toString());
+        }
+        if(subcollections.size() > 0) {
+        text.append(subcollections.toString());
+        }
+        if(languages.size() > 0) {
+        text.append(languages.toString());
+        }
+        if(plugins.size() > 0) {
+        text.append(plugins.toString());
+        }
+        if(classifiers.size() > 0) {
+        text.append(classifiers.toString());
+        }
+        if(formats.size() > 0) {
+        text.append(formats.toString());
+        }
+        if(collectionmetadatum.size() > 0) {
+        text.append(collectionmetadatum.toString());
+        }
+        text.append(metadatasets.toString());
+        if(rest.size() > 0) {
+        // Write out rest at the bottom.
+        text.append("# These instructions are not recognized by the Gatherer.\n");
+        for(int i = 0; i < rest.size(); i++) {
+            text.append(rest.get(i));
+            text.append("\n");
+        }
+        }
+        out.write(text.toString().getBytes());
+        out.close();
+        out = null;
+    }
+    catch(Exception error) {
+        error.printStackTrace();
+    }
+    }
+    /** Method used during a global search and replace to highlight the appropriate record within the Collection Design Managers version of the Metadata Set Manager (view only).
+     * @param element The name of the desired element as a <strong>String</strong>.
+     * @see org.greenstone.gatherer.cdm.GUI
+     * @see org.greenstone.gatherer.cdm.MetadataSetManager
+     */
+    public Rectangle setSelectedElement(String element) {
+    // First ensure that the metadata set controls are visible.
+    gui.setSelectedView("CDM.GUI.MetadataSets");
+    // Then tell them to select the given element.
+    return metadatasets.setSelectedElement(element);
+    }
+}

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

-              r4293
+              r4366
  */
 public class CollectionMeta
      implements Comparable {
      /** A reference to the collection design manager for access to the language manager. */
      private CollectionDesignManager manager = null;
      /** The language of this metadata. Should be a two letter code. */
      private Language language = null;
      /** The name of the thing this metadata is assigned to, which may index an Index. */
      private Object name = null;
      /** The value of this metadata. */
      private String value = null;
      /** Constructor.
       * @param name The object the metadata is assigned to as an <strong>Object</strong>.
       * @param language The language of the metadata as a <strong>Language</strong>. Should be a two letter code.
       * @param value The value of this metadata, as a <strong>String</strong>.
+    implements Comparable {
+    /** A reference to the collection design manager for access to the language manager. */
+    private CollectionDesignManager manager = null;
+    /** The language of this metadata. Should be a two letter code. */
+    private Language language = null;
+    /** The name of the thing this metadata is assigned to, which may index an Index. */
+    private Object name = null;
+    /** The value of this metadata. */
+    private String value = null;
+    /** Constructor.
+     * @param name The object the metadata is assigned to as an <strong>Object</strong>.
+     * @param language The language of the metadata as a <strong>Language</strong>. Should be a two letter code.
+     * @param value The value of this metadata, as a <strong>String</strong>.
       */
      public CollectionMeta(CollectionDesignManager manager, Object name, Language language, String value) {
           this.language = language;
           this.manager = manager;
           this.name = name;
           this.value = value;
+     }
      /** Method to compare two collection metadata objects to calculate their respective ordering.
+    public CollectionMeta(CollectionDesignManager manager, Object name, Language language, String value) {
+    this.language = language;
+    this.manager = manager;
+    this.name = name;
+    this.value = value;
+    }
+    /** Method to compare two collection metadata objects to calculate their respective ordering.
       * @param object The other metadata to compare to, as an <strong>Object</strong>.
       * @return An <i>int</i> which is less than 0 if this object proceeds the given object, 0 if they are equal and greater than 0 otherwise.
       * @see org.greenstone.gatherer.cdm.Language
       */
      public int compareTo(Object object) {
           if(object instanceof CollectionMeta) {
                 CollectionMeta metadata = (CollectionMeta) object;
                 int result = name.toString().compareTo(metadata.getName().toString());
                 if(result == 0) {
                      Language other_language = metadata.getLanguage();
                      if(language != null && other_language != null) {
                           result = language.compareTo(metadata.getLanguage());
                           if(result == 0) {
                                 return value.compareTo(metadata.getValue());
+                          }
+                     }
                      else if(language != null) {
                           return -1;
+                     }
                      else if(other_language != null) {
                           return 1;
+                     }
+                }
                 return result;
+          }
           return toString().compareTo(object.toString());
+     }
      /** Method to compare two collection metadata objects for equality.
+    public int compareTo(Object object) {
+    if(object instanceof CollectionMeta) {
+        CollectionMeta metadata = (CollectionMeta) object;
+        int result = name.toString().compareTo(metadata.getName().toString());
+        if(result == 0) {
+        Language other_language = metadata.getLanguage();
+        if(language != null && other_language != null) {
+            result = language.compareTo(metadata.getLanguage());
+            if(result == 0) {
+            return value.compareTo(metadata.getValue());
+            }
+        }
+        else if(language != null) {
+            return -1;
+        }
+        else if(other_language != null) {
+            return 1;
+        }
+        }
+        return result;
+    }
+    return toString().compareTo(object.toString());
+    }
+    /** Method to compare two collection metadata objects for equality.
       * @param object The other metadata to compare to, as an <strong>Object</strong>.
       * @return A <i>boolean</i> value of <i>true</i> if the object are equal, <i>false</i> otherwise.
       */
      public boolean equals(Object object) {
           if(compareTo(object) == 0) {
                 return true;
+          }
           return false;
+     }
      /** Method to retrieve the value of language.
+    public boolean equals(Object object) {
+    if(compareTo(object) == 0) {
+        return true;
+    }
+    return false;
+    }
+    /** Method to retrieve the value of language.
       * @return The value of language as a <strong>Language</strong>.
       */
      public Language getLanguage() {
           return language;
+     }
      /** Method to retrieve the value of name.
+    public Language getLanguage() {
+    return language;
+    }
+    /** Method to retrieve the value of name.
       * @return The value of name as an <strong>Object</strong>.
       */
      public Object getName() {
           return name;
+     }
      /** Method to retrieve the value of value (well great choice of name there).
+    public Object getName() {
+    return name;
+    }
+    /** Method to retrieve the value of value (well great choice of name there).
       * @return The value of value as a <strong>String</strong>.
       */
      public String getValue() {
           return value;
+     }
      /** Method to print out this class as it would appear within the collection configuration file.
+    public String getValue() {
+    return value;
+    }
+    /** Method to print out this class as it would appear within the collection configuration file.
       * @return A <strong>String</strong> containing the text value of this class.
       */
      public String toString() {
           String text = "collectionmeta ";
           if(name instanceof Index) {
                 text = text + ".";
                 Index index = (Index)name;
                 text = text + index.toString(false) + " ";
+          }
           else {
                 text = text + name.toString() + " ";
+          }
           if(language != null && manager.languages.size() > 0 && !manager.languages.isDefaultLanguage(language)) {
                 text = text + "[l=" + language.getCode() + "] ";
+          }
           text = text + "\"" + Utility.encodeGreenstone(value) + "\"\n";
           return text;
+     }
      /** Used to update the contents of this collection level metadata to the given 'new' values.
+    public String toString() {
+    String text = "collectionmeta ";
+    if(name instanceof Index) {
+        text = text + ".";
+        Index index = (Index)name;
+        text = text + index.toString(false) + " ";
+    }
+    else {
+        text = text + name.toString() + " ";
+    }
+    if(language != null && manager.languages.size() > 0 && !manager.languages.isDefaultLanguage(language)) {
+        text = text + "[l=" + language.getCode() + "] ";
+    }
+    text = text + "\"" + Utility.encodeGreenstone(value) + "\"\n";
+    return text;
+    }
+    /** Used to update the contents of this collection level metadata to the given 'new' values.
       * @param name The new name of the metadata, as a <strong>Object</strong>.
       * @param language The new <strong>Language</strong> of the metadata.
       * @param value And the value the metadata is assigned, as a <strong>String</strong>.
       */
      public void update(Object name, Language language, String value) {
           this.name = name;
           this.language = language;
           this.value = value;
+     }
      /** Ensure this is a valid metadata entry by checking that the value is non-null and non-zero length (after having removed whitespace).
+    public void update(Object name, Language language, String value) {
+    this.name = name;
+    this.language = language;
+    this.value = value;
+    }
+    /** Ensure this is a valid metadata entry by checking that the value is non-null and non-zero length (after having removed whitespace).
       * @return <i>true</i> if this metadata has a valid value and should be added to the config, <i>false</i> otherwise.
       */
      public boolean valid() {
           return(value != null && value.trim().length() > 0);
+     }
+    public boolean valid() {
+    return(value != null && value.trim().length() > 0);
+    }
+}

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

-              r4293
+              r4366
 // ####################################################################################
 public class CollectionMetaManager
      extends DefaultListModel {
      /** A reference to the cdm manager so we can access indexes and languages. */
      private CollectionDesignManager manager = null;
      /** A reference to ourself so that inner classes can use us as a model. */
      private DefaultListModel model = null;
      /** A reference to the Gatherer. */
      private Gatherer gatherer = null;
      /** The language the most recent metadata returned was in. */
      private Language current_language = null;
     /** We can't safely parse metadata commands until after all the other commands have been parsed, so we store commands here for now. */
     private ArrayList unresolved_commands = null;
      /** Constructor.
       * @param gatherer A reference to the <strong>Gatherer</strong>.
       * @param manager A reference to the <strong>CollectionDesignManager</strong> for access to other configuration managers.
       */
      public CollectionMetaManager(Gatherer gatherer, CollectionDesignManager manager) {
           super();
           this.gatherer = gatherer;
           this.manager = manager;
           this.model = this;
           this.unresolved_commands = new ArrayList();
+     }
      /** Method to add a new piece of metadata.
+    extends DefaultListModel {
+    /** A reference to the cdm manager so we can access indexes and languages. */
+    private CollectionDesignManager manager = null;
+    /** A reference to ourself so that inner classes can use us as a model. */
+    private DefaultListModel model = null;
+    /** A reference to the Gatherer. */
+    private Gatherer gatherer = null;
+    /** The language the most recent metadata returned was in. */
+    private Language current_language = null;
+    /** We can't safely parse metadata commands until after all the other commands have been parsed, so we store commands here for now. */
+    private ArrayList unresolved_commands = null;
+    /** Constructor.
+     * @param gatherer A reference to the <strong>Gatherer</strong>.
+     * @param manager A reference to the <strong>CollectionDesignManager</strong> for access to other configuration managers.
+     */
+    public CollectionMetaManager(Gatherer gatherer, CollectionDesignManager manager) {
+    super();
+    this.gatherer = gatherer;
+    this.manager = manager;
+    this.model = this;
+    this.unresolved_commands = new ArrayList();
+    }
+    /** Method to add a new piece of metadata.
       * @param metadata The new <strong>CollectionMeta</strong>.
       */
      public void addMetadata(CollectionMeta metadata) {
           CollectionMeta existing = getMetadata(metadata.getName().toString(), metadata.getLanguage(), false);
           if(existing != null) {
                 removeElement(existing);
+          }
           addElement(metadata);
           gatherer.c_man.configurationChanged();
+     }
      /** Retrieve the collectionextra metadata in the default language, if present.
+    public void addMetadata(CollectionMeta metadata) {
+    CollectionMeta existing = getMetadata(metadata.getName().toString(), metadata.getLanguage(), false);
+    if(existing != null) {
+        removeElement(existing);
+    }
+    addElement(metadata);
+    gatherer.c_man.configurationChanged();
+    }
+    /** Retrieve the collectionextra metadata in the default language, if present.
       * @return A <strong>CollectionMeta</strong> containing the collectionextra in the default language if present, or else the first collectionextra of any language, otherwise <i>null</i>.
       * @see org.greenstone.gatherer.cdm.Language
       */
      public CollectionMeta getCollectionExtra() {
           CollectionMeta result = getMetadata("collectionextra", manager.languages.getDefaultLanguage(), true);
           if(result == null) {
                 result = new CollectionMeta(manager, "collectionextra", manager.languages.getDefaultLanguage(), "");
                 addMetadata(result);
+          }
           return result;
+     }
      /** Retrieve the collectionname metadata in the default language, if present.
+    public CollectionMeta getCollectionExtra() {
+    CollectionMeta result = getMetadata("collectionextra", manager.languages.getDefaultLanguage(), true);
+    if(result == null) {
+        result = new CollectionMeta(manager, "collectionextra", manager.languages.getDefaultLanguage(), "");
+        addMetadata(result);
+    }
+    return result;
+    }
+    /** Retrieve the collectionname metadata in the default language, if present.
       * @return A <strong>CollectionMeta</strong> containing the collectionname in the default language if present, or else the first collectionname of any language, otherwise <i>null</i>.
       * @see org.greenstone.gatherer.cdm.Language
       */
      public CollectionMeta getCollectionName() {
           return getMetadata("collectionname", manager.languages.getDefaultLanguage(), true);
+     }
      /** Retrieve the iconcollection metadata in the default language, if present.
+    public CollectionMeta getCollectionName() {
+    return getMetadata("collectionname", manager.languages.getDefaultLanguage(), true);
+    }
+    /** Retrieve the iconcollection metadata in the default language, if present.
       * @return A <strong>CollectionMeta</strong> containing the iconcollection in the default language if present, or else the first iconcollection of any language, otherwise <i>null</i>.
       * @see org.greenstone.gatherer.cdm.Language
       */
      public CollectionMeta getIconCollection() {
           CollectionMeta result = getMetadata("iconcollection", manager.languages.getDefaultLanguage(), true);
           if(result == null) {
                 result = new CollectionMeta(manager, "iconcollection", manager.languages.getDefaultLanguage(), "");
                 addMetadata(result);
+          }
           return result;
+     }
      /** Method to retrieve the list of metadata.
+    public CollectionMeta getIconCollection() {
+    CollectionMeta result = getMetadata("iconcollection", manager.languages.getDefaultLanguage(), true);
+    if(result == null) {
+        result = new CollectionMeta(manager, "iconcollection", manager.languages.getDefaultLanguage(), "");
+        addMetadata(result);
+    }
+    return result;
+    }
+    /** Method to retrieve the list of metadata.
       * @return An <strong>ArrayList</strong> containing the metadata.
       */
      public ArrayList getMetadata() {
             ArrayList metadata = new ArrayList();
             for(int i = 0; i < size(); i++) {
                 metadata.add(get(i));
+            }
           Collections.sort(metadata);
           return metadata;
+     }
+    public ArrayList getMetadata() {
+    ArrayList metadata = new ArrayList();
+    for(int i = 0; i < size(); i++) {
+        metadata.add(get(i));
+    }
+    Collections.sort(metadata);
+    return metadata;
+    }
      /** Retrieve all of the metadata for the given feature, regardless of language. */
      public ArrayList getMetadata(String name) {
           ArrayList result = new ArrayList();
           for(int i = 0; i < size(); i++) {
                 CollectionMeta metadata = (CollectionMeta) get(i);
                 if(metadata.getName().equals(name)) {
                      result.add(metadata);
+                }
+          }
           return result;
+     }
      /** Method to retrieve a certain piece of metadata based on its name and language.
+    /** Retrieve all of the metadata for the given feature, regardless of language. */
+    public ArrayList getMetadata(String name) {
+    ArrayList result = new ArrayList();
+    for(int i = 0; i < size(); i++) {
+        CollectionMeta metadata = (CollectionMeta) get(i);
+        if(metadata.getName().equals(name)) {
+        result.add(metadata);
+        }
+    }
+    return result;
+    }
+    /** Method to retrieve a certain piece of metadata based on its name and language.
       * @param name The name of the metadata as a <strong>String</strong>.
       * @param language The <strong>Language</strong> of the metadata.
 …
       * @return The <strong>CollectionMeta</strong> requested, or <i>null</i> if no such metadata.
       */
      public CollectionMeta getMetadata(String name, Language language, boolean partial) {
           CollectionMeta partial_match = null;
           for(int i = 0; i < size(); i++) {
                 CollectionMeta metadata = (CollectionMeta) get(i);
                 if(metadata.getName().equals(name)) {
                      if (metadata.getLanguage().equals(language)) {
                           return metadata;
+                     }
                      partial_match = metadata;
+                }
+          }
           if(partial) {
                 return partial_match;
+          }
           return null;
+     }
      /** Method that attempts to parse a collection metadata command from the given text. If a command is parsed successfully it is immediately added to the the collections metadata.
+    public CollectionMeta getMetadata(String name, Language language, boolean partial) {
+    CollectionMeta partial_match = null;
+    for(int i = 0; i < size(); i++) {
+        CollectionMeta metadata = (CollectionMeta) get(i);
+        if(metadata.getName().equals(name)) {
+        if (metadata.getLanguage().equals(language)) {
+            return metadata;
+        }
+        partial_match = metadata;
+        }
+    }
+    if(partial) {
+        return partial_match;
+    }
+    return null;
+    }
+    /** Method that attempts to parse a collection metadata command from the given text. If a command is parsed successfully it is immediately added to the the collections metadata.
      * @param command The command text we wish to parse, as a <strong>String</strong>.
      * @return A <i>boolean</i> which is <i>true</i> if a collection metadata command was successfully parsed, <i>false</i> otherwise.
 …
      * @see org.greenstone.gatherer.util.Utility
      */
      public boolean parse(String command, boolean finished) {
          String temp = command.toLowerCase();
          if(temp.startsWith("collectionmeta")) {
               if(finished) {
                     CommandTokenizer ct = new CommandTokenizer(command);
                     if(ct.countTokens() >= 3) {
                          ct.nextToken(); // Throw away collectionmeta
                          Object key = ct.nextToken();
                          Language language = null;
                          String language_code = null;
                          String value = ct.nextToken();
                          // Arg. Remember a language token will be '[l=<code>]'
                          if(value.startsWith("[") && value.endsWith("]")) {
                               language_code = value.substring(3, value.length() - 1);
                               ///ystem.err.println("Language code = " + language_code);
                               value = ct.nextToken();
+                         }
                          // Check if the key is an index, an if so retrieve it.
                          if(((String)key).startsWith(".")) {
                               String key_str = (String)key;
                               key_str = key_str.substring(1);
                               key = manager.indexes.getIndex(key_str);
+                         }
                          // An if we have a language code, retrieve its object too.
                          if(language_code != null) {
                               language = manager.languages.getLanguage(language_code, false);
+                         }
                          // Otherwise set language to the default language.
                          else {
                               language = manager.languages.getDefaultLanguage();
+                         }
                          if(key != null) {
                               // Trim any "
                               if(value.equals("\"\"")) {
                                     value = "";
+                              }
                               else {
                                     if(value.startsWith("\"")) {
                                          value = value.substring(1);
+                                    }
                                     if(value.endsWith("\"")) {
                                          value = value.substring(0, value.length() - 1);
+                                    }
+                              }
                               CollectionMeta meta = new CollectionMeta(manager, key, language, Utility.decodeGreenstone(value));
                               addMetadata(meta);
+                         }
                          return true;
+                    }
+              }
               else {
                     unresolved_commands.add(command);
                     return true;
+              }
+         }
          return false;
+     }
      /** Ensure that the values being showed are the most up to date. */
      public void refresh() {
           fireContentsChanged(this, 0, size());
+     }
      /** Method to remove a piece of metadata.
+    public boolean parse(String command, boolean finished) {
+    String temp = command.toLowerCase();
+    if(temp.startsWith("collectionmeta")) {
+        if(finished) {
+        CommandTokenizer ct = new CommandTokenizer(command);
+        if(ct.countTokens() >= 3) {
+            ct.nextToken(); // Throw away collectionmeta
+            Object key = ct.nextToken();
+            Language language = null;
+            String language_code = null;
+            String value = ct.nextToken();
+            // Arg. Remember a language token will be '[l=<code>]'
+            if(value.startsWith("[") && value.endsWith("]")) {
+            language_code = value.substring(3, value.length() - 1);
+            ///ystem.err.println("Language code = " + language_code);
+            value = ct.nextToken();
+            }
+            // Check if the key is an index, an if so retrieve it.
+            if(((String)key).startsWith(".")) {
+            String key_str = (String)key;
+            key_str = key_str.substring(1);
+            key = manager.indexes.getIndex(key_str);
+            }
+            // An if we have a language code, retrieve its object too.
+            if(language_code != null) {
+            language = manager.languages.getLanguage(language_code, false);
+            }
+            // Otherwise set language to the default language.
+            else {
+            language = manager.languages.getDefaultLanguage();
+            }
+            if(key != null) {
+            // Trim any "
+            if(value.equals("\"\"")) {
+                value = "";
+            }
+            else {
+                if(value.startsWith("\"")) {
+                value = value.substring(1);
+                }
+                if(value.endsWith("\"")) {
+                value = value.substring(0, value.length() - 1);
+                }
+            }
+            CollectionMeta meta = new CollectionMeta(manager, key, language, Utility.decodeGreenstone(value));
+            addMetadata(meta);
+            }
+            return true;
+        }
+        }
+        else {
+        unresolved_commands.add(command);
+        return true;
+        }
+    }
+    return false;
+    }
+    /** Ensure that the values being showed are the most up to date. */
+    public void refresh() {
+    fireContentsChanged(this, 0, size());
+    }
+    /** Method to remove a piece of metadata.
       * @param metadata The <strong>CollectionMeta</strong> you wish to remove.
       */
      public void removeMetadata(CollectionMeta metadata) {
           removeElement(metadata);
           gatherer.c_man.configurationChanged();
+     }
      /** Method which attempts to reparse obvious metadata commands which used unresovable references.
       */
      public void reparseUnresolved() {
           for(int i = 0; i < unresolved_commands.size(); i++) {
                 parse((String)unresolved_commands.get(i), true);
+          }
           // Regardless of if they work, clear the commands.
           unresolved_commands.clear();
+     }
      /** Sets the value of a certain metadata.
+    public void removeMetadata(CollectionMeta metadata) {
+    removeElement(metadata);
+    gatherer.c_man.configurationChanged();
+    }
+    /** Method which attempts to reparse obvious metadata commands which used unresovable references.
+      */
+    public void reparseUnresolved() {
+    for(int i = 0; i < unresolved_commands.size(); i++) {
+        parse((String)unresolved_commands.get(i), true);
+    }
+    // Regardless of if they work, clear the commands.
+    unresolved_commands.clear();
+    }
+    /** Sets the value of a certain metadata.
       * @param name The name of the metadata as a <strong>String</strong>.
       * @param language The <strong>Language</strong> to use.
       * @param value The value of the metadata also as a <strong>String</strong>.
       */
      public void setMetadata(String name, Language language, String value) {
           addMetadata(new CollectionMeta(manager, name, language, value));
+     }
      /** Method to produce the list of metadata in a string such as you would find in the collection configuration file.
+    public void setMetadata(String name, Language language, String value) {
+    addMetadata(new CollectionMeta(manager, name, language, value));
+    }
+    /** Method to produce the list of metadata in a string such as you would find in the collection configuration file.
       * @return A <strong>String</strong> containing the list of collection metadata.
       */
      public String toString() {
           StringBuffer text = new StringBuffer("");
           for(int i = 0; i < size(); i++) {
                 CollectionMeta data = (CollectionMeta) get(i);
                 if(data.valid()) {
                      text.append(data.toString());
+                }
+          }
           text.append("\n");
           return text.toString();
+     }
      /** Overloaded to call get with both a key and an empty argument array.
+    public String toString() {
+    StringBuffer text = new StringBuffer("");
+    for(int i = 0; i < size(); i++) {
+        CollectionMeta data = (CollectionMeta) get(i);
+        if(data.valid()) {
+        text.append(data.toString());
+        }
+    }
+    text.append("\n");
+    return text.toString();
+    }
+    /** Overloaded to call get with both a key and an empty argument array.
       * @param key A <strong>String</strong> which is mapped to a initial String within the ResourceBundle.
       * @return A <strong>String</strong> which has been referenced by the key String and that either contains no argument fields, or has had the argument fields automatiically populated with formatting Strings of with argument String provided in the get call.
       */
      private String get(String key) {
           return get(key, null);
+     }
      /** Used to retrieve a property value from the Locale specific ResourceBundle, based upon the key and arguments supplied. If the key cannot be found or if some other part of the call fails a default (English) error message is returned. <BR>
+    private String get(String key) {
+    return get(key, null);
+    }
+    /** Used to retrieve a property value from the Locale specific ResourceBundle, based upon the key and arguments supplied. If the key cannot be found or if some other part of the call fails a default (English) error message is returned. <BR>
       * Here the get recieves a second argument which is an array of Strings used to populate argument fields, denoted {<I>n</I>}, within the value String returned. Note that argument numbers greater than or equal to 32 are automatically mapped to the formatting String named Farg<I>n</I>.
       * @param key A <strong>String</strong> which is mapped to a initial String within the ResourceBundle.
 …
       * @see org.greenstone.gatherer.Dictionary
       */
      private String get(String key, String args[]) {
           if(key.indexOf('.') == -1) {
                 key = "CDM.CollectionMetaManager." + key;
+          }
           return gatherer.dictionary.get(key, args);
+     }
+    private String get(String key, String args[]) {
+    if(key.indexOf('.') == -1) {
+        key = "CDM.CollectionMetaManager." + key;
+    }
+    return gatherer.dictionary.get(key, args);
+    }
+}

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

-              r4293
+              r4366
  */
 public class CommandTokenizer
      extends StringTokenizer {
+    extends StringTokenizer {
      private int last_type = -1;
+    private int last_type = -1;
      static final public int BRACKET_ENCLOSED      = 0;
      static final public int DOUBLE_QUOTE_ENCLOSED = 1;
      static final public int NORMAL                = 2;
      static final public int QUOTE_ENCLOSED        = 3;
+    static final public int BRACKET_ENCLOSED      = 0;
+    static final public int DOUBLE_QUOTE_ENCLOSED = 1;
+    static final public int NORMAL                = 2;
+    static final public int QUOTE_ENCLOSED        = 3;
      /** Constructor.
       * @param command The command <strong>String</strong> you wish to tokenize.
       */
      public CommandTokenizer(String command) {
           super(command);
+     }
+    /** Constructor.
+     * @param command The command <strong>String</strong> you wish to tokenize.
+     */
+    public CommandTokenizer(String command) {
+    super(command);
+    }
      public int getLastType() {
           return last_type;
+     }
+    public int getLastType() {
+    return last_type;
+    }
      public boolean isComment() {
           return (last_type == DOUBLE_QUOTE_ENCLOSED || last_type == QUOTE_ENCLOSED);
+     }
+    public boolean isComment() {
+    return (last_type == DOUBLE_QUOTE_ENCLOSED || last_type == QUOTE_ENCLOSED);
+    }
      /** Method to retrieve the next token from the command, taking care to group tokens enclosed in speech marks.
       * @return A <strong>String</strong> containing the next token from the command.
       */
      public String nextToken() {
           String result = null;
           if(hasMoreTokens()) {
                 StringBuffer buffer = new StringBuffer(super.nextToken());
                 switch(buffer.charAt(0)) {
                 case '\"':
                      while((buffer.length() == 1 || buffer.charAt(buffer.length() - 1) != '\"') && hasMoreTokens()) {
                           buffer.append(" ");
                           buffer.append(super.nextToken());
                           ///ystem.err.println("Current Buffer = '" + buffer.toString() + "'");
+                     }
                      ///ystem.err.println("Final Buffer = '" + buffer.toString() + "'");
                      last_type = DOUBLE_QUOTE_ENCLOSED;
                      break;
                 case '\'':
                      while((buffer.length() == 1 || buffer.charAt(buffer.length() - 1) != '\'') && hasMoreTokens()) {
                           buffer.append(" ");
                           buffer.append(super.nextToken());
+                     }
                      last_type = QUOTE_ENCLOSED;
                      break;
                 case '[':
                      while((buffer.length() == 1 || buffer.charAt(buffer.length() - 1) != ']') && hasMoreTokens()) {
                           buffer.append(" ");
                           buffer.append(super.nextToken());
+                     }
                      last_type = BRACKET_ENCLOSED;
                      break;
                 default:
                      last_type = NORMAL;
+                }
                 result = buffer.toString();
+          }
           return result;
+     }
      /** Unfortunately the StringBuffer doesn't have a built in endsWith method, so I'll just have to implement my own.
       * @param str The <strong>StringBuffer</strong> we are checking the end of.
       * @param target The <strong>String</strong> fragment we are searching for.
       * @return <i>true</i> if str ends with target, <i>false</i> otherwise.
       */
      private boolean endsWith(StringBuffer str, String target) {
           String temp = str.toString();
           if(temp.endsWith(target) != (str.lastIndexOf(target) == str.length() - target.length())) {
+    /** Method to retrieve the next token from the command, taking care to group tokens enclosed in speech marks.
+     * @return A <strong>String</strong> containing the next token from the command.
+     */
+    public String nextToken() {
+    String result = null;
+    if(hasMoreTokens()) {
+        StringBuffer buffer = new StringBuffer(super.nextToken());
+        switch(buffer.charAt(0)) {
+        case '\"':
+        while((buffer.length() == 1 || buffer.charAt(buffer.length() - 1) != '\"') && hasMoreTokens()) {
+            buffer.append(" ");
+            buffer.append(super.nextToken());
+            ///ystem.err.println("Current Buffer = '" + buffer.toString() + "'");
+        }
+        ///ystem.err.println("Final Buffer = '" + buffer.toString() + "'");
+        last_type = DOUBLE_QUOTE_ENCLOSED;
+        break;
+        case '\'':
+        while((buffer.length() == 1 || buffer.charAt(buffer.length() - 1) != '\'') && hasMoreTokens()) {
+            buffer.append(" ");
+            buffer.append(super.nextToken());
+        }
+        last_type = QUOTE_ENCLOSED;
+        break;
+        case '[':
+        while((buffer.length() == 1 || buffer.charAt(buffer.length() - 1) != ']') && hasMoreTokens()) {
+            buffer.append(" ");
+            buffer.append(super.nextToken());
+        }
+        last_type = BRACKET_ENCLOSED;
+        break;
+        default:
+        last_type = NORMAL;
+        }
+        result = buffer.toString();
+    }
+    return result;
+    }
+    /** Unfortunately the StringBuffer doesn't have a built in endsWith method, so I'll just have to implement my own.
+     * @param str The <strong>StringBuffer</strong> we are checking the end of.
+     * @param target The <strong>String</strong> fragment we are searching for.
+     * @return <i>true</i> if str ends with target, <i>false</i> otherwise.
+     */
+    private boolean endsWith(StringBuffer str, String target) {
+    String temp = str.toString();
+    if(temp.endsWith(target) != (str.lastIndexOf(target) == str.length() - target.length())) {
                 ///ystem.err.println("Holy error that'll crash the HFile creator if it happens twice, Batman!");
                 ///ystem.err.println("String = '" + temp + "'");
                 ///ystem.err.println("Target = '" + target + "'");
+          }
           return str.lastIndexOf(target) == str.length() - target.length();
+     }
+    }
+    return str.lastIndexOf(target) == str.length() - target.length();
+    }
+}

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

-              r4293
+              r4366
  */
 public interface CustomClassifier
      extends Comparable {
      /** Constructor.
       * public CustomClassifier(Gatherer gatherer);
+    extends Comparable {
+    /** Constructor.
+     * public CustomClassifier(Gatherer gatherer);
       */
      /** Create a blank copy of this pseudo-classifier.
       * @return A newly allocated <strong>CustomClassifier</strong>.
       */
      public CustomClassifier copy();
      /** Destructor. */
      public void destroy();
      /** Show the controls for configuring this pseudo-classifier.
+    public CustomClassifier copy();
+    /** Destructor. */
+    public void destroy();
+    /** Show the controls for configuring this pseudo-classifier.
       * @param show <i>true</i> if the component should immediately show itself, <i>false</i> if you just wish to initialize components.
       */
      public boolean display(boolean show);
      /** Method to return this pseudo-classifier represented as a String.
+    public boolean display(boolean show);
+    /** Method to return this pseudo-classifier represented as a String.
       * @return A <strong>String</strong>.
       */
      public String getCommand();
      /** Retrieve the custom command, a command line that overrides and replaces some other 'actual' classifier.
+    public String getCommand();
+    /** Retrieve the custom command, a command line that overrides and replaces some other 'actual' classifier.
       * @param index The number of the classifer this one is replacing.
       */
      public String getCustomCommand(int index);
      /** Get the name of this custom classifier.
+    public String getCustomCommand(int index);
+    /** Get the name of this custom classifier.
       * @return A <strong>String</strong> representing the name.
       */
      public String getName();
      public void process(FileNode record);
      /** Recreate a CustomAZList given several parameters including the real classifier created during custom design.
       * @param classifier The real <strong>Classifier</strong>.
       * @param separations A <strong>String</strong> representing the choosen separations.
       */
      public void recreate(Classifier classifier, String separations);
      /** Sets the value of Gatherer, for those classes loaded dynamically.
+    public String getName();
+    public void process(FileNode record);
+    /** Recreate a CustomAZList given several parameters including the real classifier created during custom design.
+     * @param classifier The real <strong>Classifier</strong>.
+     * @param separations A <strong>String</strong> representing the choosen separations.
+     */
+    public void recreate(Classifier classifier, String separations);
+    /** Sets the value of Gatherer, for those classes loaded dynamically.
       * @param gatherer A reference to the <strong>Gatherer</strong>.
       */
      public void setGatherer(Gatherer gatherer);
      /** Sets the Classifier manager in charge of this classifier.
+    public void setGatherer(Gatherer gatherer);
+    /** Sets the Classifier manager in charge of this classifier.
       * @param manager This classifiers <strong>ClassifierManager</strong>.
       */
      public void setManager(ClassifierManager manager);
+    public void setManager(ClassifierManager manager);
+}

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

-              r4293
+              r4366
  */
 public class DefaultSubIndex
      extends SubIndex {
      /** Copy constructor.
       * @param subindex The <strong>SubIndex</strong> we are copying.
+    extends SubIndex {
+    /** Copy constructor.
+     * @param subindex The <strong>SubIndex</strong> we are copying.
       */
      public DefaultSubIndex(SubIndex subindex) {
           for(int i = 0; i < subindex.size(); i++) {
                 add(subindex.get(i));
+          }
+     }
      /** Parsed data Constructor.
+    public DefaultSubIndex(SubIndex subindex) {
+    for(int i = 0; i < subindex.size(); i++) {
+        add(subindex.get(i));
+    }
+    }
+    /** Parsed data Constructor.
       * @param raw A <strong>String</strong> containing a comma separated list of subcollection names.
       * @param manager A reference to the <strong>SubcollectionManager</strong> via which we retrieve the required <strong>Subcollection</strong>s.
       */
      public DefaultSubIndex(String raw, SubcollectionManager manager) {
           super(raw, manager);
+     }
      /** Method to extract just the subindex information from this class.
+    public DefaultSubIndex(String raw, SubcollectionManager manager) {
+    super(raw, manager);
+    }
+    /** Method to extract just the subindex information from this class.
       * @return A <strong>SubIndex</strong> based on the information in this class.
       */
      public SubIndex getSubIndex() {
           return new SubIndex(this);
+     }
      /** Method to produce this class as a string much like you'd find in the collection configuration file.
+    public SubIndex getSubIndex() {
+    return new SubIndex(this);
+    }
+    /** Method to produce this class as a string much like you'd find in the collection configuration file.
       * @return A <strong>String</string> with the default index entry.
       */
      public String toString() {
           String text = "defaultsubcollection ";
           for(int i = 0; i < size(); i++) {
                 Object object = get(i);
                 Subcollection sub = (Subcollection) get(i);
                 text = text + sub.getName();
                 if(i < size() - 1) {
                      text = text + ",";
+                }
+          }
           text = text + "\n";
           return text;
+     }
+    public String toString() {
+    String text = "defaultsubcollection ";
+    for(int i = 0; i < size(); i++) {
+        Object object = get(i);
+        Subcollection sub = (Subcollection) get(i);
+        text = text + sub.getName();
+        if(i < size() - 1) {
+        text = text + ",";
+        }
+    }
+    text = text + "\n";
+    return text;
+    }
+}

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

-              r4293
+              r4366
  */
 public class DynamicListModel
      extends DefaultListModel
      implements ComboBoxModel {
+    extends DefaultListModel
+    implements ComboBoxModel {
      private boolean auto_order = false;
+    private boolean auto_order = false;
      private Object object = null;
+    private Object object = null;
      public void addElement(Object element) {
           if(auto_order) {
+    public void addElement(Object element) {
+    if(auto_order) {
                 // Insert the object in its alphabetically correct place.
                 int position = 0;
                 boolean found = false;
                 while(!found && position < size()) {
                      ///ystem.err.print("Compare " + element.toString() + " to " + get(position).toString() + ": ");
                      int order = element.toString().compareTo(get(position).toString());
                      if(order < 0) {
                           add(position, element);
                           found = true;
                           ///ystem.err.println("Greater than. Insert");
+                     }
                      else if(order == 0) {
                           found = true;
                           ///ystem.err.println("Equal. End.");
+                     }
                      else {
                           position++;
                           ///ystem.err.println("Less than. Carry on.");
+                     }
+                }
                 if(!found) {
                      super.addElement(element);
                      ///ystem.err.println("Out of elements. Insert");
+                }
+          }
           else {
                 super.addElement(element);
+          }
+     }
+        int position = 0;
+        boolean found = false;
+        while(!found && position < size()) {
+        ///ystem.err.print("Compare " + element.toString() + " to " + get(position).toString() + ": ");
+        int order = element.toString().compareTo(get(position).toString());
+        if(order < 0) {
+            add(position, element);
+            found = true;
+            ///ystem.err.println("Greater than. Insert");
+        }
+        else if(order == 0) {
+            found = true;
+            ///ystem.err.println("Equal. End.");
+        }
+        else {
+            position++;
+            ///ystem.err.println("Less than. Carry on.");
+        }
+        }
+        if(!found) {
+        super.addElement(element);
+        ///ystem.err.println("Out of elements. Insert");
+        }
+    }
+    else {
+        super.addElement(element);
+    }
+    }
      public DynamicListModel shallowCopy() {
           DynamicListModel copy = new DynamicListModel();
           copy.setAutoOrder(auto_order);
           for(int i = 0; i < size(); i++) {
                 copy.addElement(get(i));
+          }
           return copy;
+     }
+    public DynamicListModel shallowCopy() {
+    DynamicListModel copy = new DynamicListModel();
+    copy.setAutoOrder(auto_order);
+    for(int i = 0; i < size(); i++) {
+        copy.addElement(get(i));
+    }
+    return copy;
+    }
      public Object getSelectedItem() {
           ///ystem.err.println("Get item: " + object);
           return object;
+     }
      /** Notify all controls that are based on this list model that its contents have changed, and they should repaint themselves. */
      public void refresh() {
           fireContentsChanged(this, 0, size());
+     }
+    public Object getSelectedItem() {
+    ///ystem.err.println("Get item: " + object);
+    return object;
+    }
+    /** Notify all controls that are based on this list model that its contents have changed, and they should repaint themselves. */
+    public void refresh() {
+    fireContentsChanged(this, 0, size());
+    }
      public void setAutoOrder(boolean auto_order) {
           this.auto_order = auto_order;
+     }
+    public void setAutoOrder(boolean auto_order) {
+    this.auto_order = auto_order;
+    }
      public void setSelectedItem(Object object) {
           ///ystem.err.println("Set item: " + object);
           this.object = object;
+     }
+    public void setSelectedItem(Object object) {
+    ///ystem.err.println("Set item: " + object);
+    this.object = object;
+    }
+}

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

-              r4293
+              r4366
  */
 public class ElementWrapper
      implements Comparable {
      /** The element as the data from this object. */
      private Node element = null;
      /** Constructor.
       * @param element The <strong>Node</strong> this object is wrapped around.
+    implements Comparable {
+    /** The element as the data from this object. */
+    private Node element = null;
+    /** Constructor.
+     * @param element The <strong>Node</strong> this object is wrapped around.
       */
      public ElementWrapper(Node element) {
           this.element = element;
+     }
      /** Compare two objects for ordering.
+    public ElementWrapper(Node element) {
+    this.element = element;
+    }
+    /** Compare two objects for ordering.
       * @param object The other <strong>Object</strong> to compare to.
       * @return An <i>int</i> indicating the ordering as is String.compareTo
       */
      public int compareTo(Object object) {
           if(object == null) {
                 return 1;
+          }
           return toString().compareTo(object.toString());
+     }
      /** Compare two objects for equality.
+    public int compareTo(Object object) {
+    if(object == null) {
+        return 1;
+    }
+    return toString().compareTo(object.toString());
+    }
+    /** Compare two objects for equality.
       * @param object The <strong>Object</strong> to compare to.
       * @return <i>true</i> if the objects are equal, <i>false</i> otherwise.
       */
      public boolean equals(Object object) {
           if(compareTo(object) == 0) {
                 return true;
+          }
           return false;
+     }
      /** Retrieve the name of the element.
+    public boolean equals(Object object) {
+    if(compareTo(object) == 0) {
+        return true;
+    }
+    return false;
+    }
+    /** Retrieve the name of the element.
       * @return The fully qualified name as a <strong>String</strong>.
       * @see org.greenstone.gatherer.msm.MSMUtils
       */
      public String name() {
           return MSMUtils.getFullName((Element)element);
+     }
      /** Retrieve a textual representation of this object.
+    public String name() {
+    return MSMUtils.getFullName((Element)element);
+    }
+    /** Retrieve a textual representation of this object.
       * @return A <strong>String</strong>.
       * @see org.greenstone.gatherer.msm.MSMUtils
       */
      public String toString() {
           return MSMUtils.getIdentifier(element) + ": " + MSMUtils.getDescription(element);
+     }
+    public String toString() {
+    return MSMUtils.getIdentifier(element) + ": " + MSMUtils.getDescription(element);
+    }
+}

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

-              r4293
+              r4366
  */
 public class Format {
      /** If this format is of a true/false type, the current state. */
      private boolean state = false;
      /** The type of this format command, either FLAG, FORMAT or PARAM. */
      private int type = -1;
      /** The feature this format command affects. */
      private Object feature = null;
      /** If this format refers to a specific part of a feature, this indicates the part. */
      private String part = null;
      /** A command string, which may include a specific HTML chunk used to format a control. */
      private String value = null;
      /** An element of the format type enumeration. A true/false option. */
      static final public int FLAG = 0;
      /** An element of the format type enumeration. A string parameter. */
      static final public int VALUE = 1;
      /** The default features as specified by the Greenstone Developers manual. */
      static final public String DEFAULT_FEATURES[] = {"", "DocumentArrowsBottom","DocumentButtons","DocumentContents","DocumentHeading","DocumentImages","DocumentText","DocumentUseHTML","Search"};
      /** The list of known feature parts. */
      static final public String DEFAULT_PARTS[] = {"","DateList","HList","Invisible","VList"};
      /** Constructor for a flag format command.
      * @param feature The <Strong>Object</strong> this format affects.
      * @param part The specific part of the control to format as a <strong>String</strong>.
      * @param state A <i>boolean</i> indicating this formats state.
      */
      public Format(Object feature, String part, boolean state) {
           this.feature = feature;
           this.part = part;
           this.state = state;
           this.type = FLAG;
+     }
      /** Constructor for a format-string format command.
      * @param feature The <Strong>Object</strong> this format affects.
      * @param part The specific part of the control to format as a <strong>String</strong>.
      * @param value The format <strong>String</strong> which may be a label name, or a piece of HTML formatting.
      */
      public Format(Object feature, String part, String value) {
           this.feature = feature;
           this.part = part;
           this.type = VALUE;
           this.value = value;
+     }
      /** Method to retrieve the value of feature, which may either be a String or a Classifier.
       * @return The value of feature as an <strong>Object</strong>.
       */
      public Object getFeature() {
           return feature;
+     }
      /** Method to retrieve the value of part.
       * @return The value of part as a <Strong>String</strong>.
       */
      public String getPart() {
           return part;
+     }
      /** Method to retrieve this formats special Greenstone position code.
       * @return A <strong>String</strong> which distinctly indicates this classifiers position.
       * @see org.greenstone.gatherer.cdm.Classifier
       */
      public String getPosition() {
           ///ystem.err.println("Retrieving the name of feature " + feature);
           String position = null;
           if(feature instanceof Classifier) {
                 position = ((Classifier)feature).getPositionString();
+          }
           else {
                 position = feature.toString();
+          }
           ///ystem.err.println("Result: " + position + part);
           return position + part;
+     }
      /** Method to retrieve the value of state.
       * @param The value of state as a <i>boolean</i>.
       */
      public boolean getState() {
           return state;
+     }
      /** Method to retrieve the value of type.
       * @param The value of type as an <i>int</i>.
       */
      public int getType() {
           return type;
+     }
      /** Retrieve the value of value.
       * @return A <strong>String</strong> which is the value of value.
       */
      public String getValue() {
           return value;
+     }
      /** Set the value of state.
       * @param state The new value for state as a <i>boolean</i>.
       */
      public void setState(boolean state) {
           this.state = state;
+     }
      /** Set the value of type.
       * @param type The new value for type as an <i>int</i>.
       */
      public void setType(int type) {
           this.type = type;
+     }
      /** Set the value of value. Hmmm.
       * @param value The new value from value as a <strong>String</strong>.
       */
      public void setValue(String value) {
           this.value = value;
+     }
      /** Method to translate this classes information into a line of text as you would expect in the collection configuration file.
       * @return A <strong>String</strong> containing the format command.
       */
      public String toString() {
           String text = "format ";
           text = text + getPosition() + " ";
           switch(type) {
           case FLAG:
                 if(state) {
                      text = text + "true";
+                }
                 else {
                      text = text + "false";
+                }
                 break;
           default:
                 text = text + "\"" + value + "\"";
+          }
           return text;
+     }
      /** Retrieve the type of a certain named feature.
       * @param name The name of the feature as a <strong>String</strong>.
       * @return An <i>int</i> indicating the type, and hence the controls needed to edit this type.
       */
      static public int getType(String name) {
           int index = -1;
           for(int i = 1; i < DEFAULT_FEATURES.length; i++) {
                 if(name.equalsIgnoreCase(DEFAULT_FEATURES[i])) {
                      index = i;
+                }
+          }
           if(index == 1 || index == 3 || index == 5 || index == 7) {
                 return FLAG;
+          }
           return VALUE;
+     }
+    /** If this format is of a true/false type, the current state. */
+    private boolean state = false;
+    /** The type of this format command, either FLAG, FORMAT or PARAM. */
+    private int type = -1;
+    /** The feature this format command affects. */
+    private Object feature = null;
+    /** If this format refers to a specific part of a feature, this indicates the part. */
+    private String part = null;
+    /** A command string, which may include a specific HTML chunk used to format a control. */
+    private String value = null;
+    /** An element of the format type enumeration. A true/false option. */
+    static final public int FLAG = 0;
+    /** An element of the format type enumeration. A string parameter. */
+    static final public int VALUE = 1;
+    /** The default features as specified by the Greenstone Developers manual. */
+    static final public String DEFAULT_FEATURES[] = {"", "DocumentArrowsBottom","DocumentButtons","DocumentContents","DocumentHeading","DocumentImages","DocumentText","DocumentUseHTML","Search"};
+    /** The list of known feature parts. */
+    static final public String DEFAULT_PARTS[] = {"","DateList","HList","Invisible","VList"};
+    /** Constructor for a flag format command.
+     * @param feature The <Strong>Object</strong> this format affects.
+     * @param part The specific part of the control to format as a <strong>String</strong>.
+     * @param state A <i>boolean</i> indicating this formats state.
+     */
+    public Format(Object feature, String part, boolean state) {
+    this.feature = feature;
+    this.part = part;
+    this.state = state;
+    this.type = FLAG;
+    }
+    /** Constructor for a format-string format command.
+     * @param feature The <Strong>Object</strong> this format affects.
+     * @param part The specific part of the control to format as a <strong>String</strong>.
+     * @param value The format <strong>String</strong> which may be a label name, or a piece of HTML formatting.
+     */
+    public Format(Object feature, String part, String value) {
+    this.feature = feature;
+    this.part = part;
+    this.type = VALUE;
+    this.value = value;
+    }
+    /** Method to retrieve the value of feature, which may either be a String or a Classifier.
+     * @return The value of feature as an <strong>Object</strong>.
+     */
+    public Object getFeature() {
+    return feature;
+    }
+    /** Method to retrieve the value of part.
+     * @return The value of part as a <Strong>String</strong>.
+     */
+    public String getPart() {
+    return part;
+    }
+    /** Method to retrieve this formats special Greenstone position code.
+     * @return A <strong>String</strong> which distinctly indicates this classifiers position.
+     * @see org.greenstone.gatherer.cdm.Classifier
+     */
+    public String getPosition() {
+    ///ystem.err.println("Retrieving the name of feature " + feature);
+    String position = null;
+    if(feature instanceof Classifier) {
+        position = ((Classifier)feature).getPositionString();
+    }
+    else {
+        position = feature.toString();
+    }
+    ///ystem.err.println("Result: " + position + part);
+    return position + part;
+    }
+    /** Method to retrieve the value of state.
+     * @param The value of state as a <i>boolean</i>.
+     */
+    public boolean getState() {
+    return state;
+    }
+    /** Method to retrieve the value of type.
+     * @param The value of type as an <i>int</i>.
+     */
+    public int getType() {
+    return type;
+    }
+    /** Retrieve the value of value.
+     * @return A <strong>String</strong> which is the value of value.
+     */
+    public String getValue() {
+    return value;
+    }
+    /** Set the value of state.
+     * @param state The new value for state as a <i>boolean</i>.
+     */
+    public void setState(boolean state) {
+    this.state = state;
+    }
+    /** Set the value of type.
+     * @param type The new value for type as an <i>int</i>.
+     */
+    public void setType(int type) {
+    this.type = type;
+    }
+    /** Set the value of value. Hmmm.
+     * @param value The new value from value as a <strong>String</strong>.
+     */
+    public void setValue(String value) {
+    this.value = value;
+    }
+    /** Method to translate this classes information into a line of text as you would expect in the collection configuration file.
+     * @return A <strong>String</strong> containing the format command.
+     */
+    public String toString() {
+    String text = "format ";
+    text = text + getPosition() + " ";
+    switch(type) {
+    case FLAG:
+        if(state) {
+        text = text + "true";
+        }
+        else {
+        text = text + "false";
+        }
+        break;
+    default:
+        text = text + "\"" + value + "\"";
+    }
+    return text;
+    }
+    /** Retrieve the type of a certain named feature.
+     * @param name The name of the feature as a <strong>String</strong>.
+     * @return An <i>int</i> indicating the type, and hence the controls needed to edit this type.
+     */
+    static public int getType(String name) {
+    int index = -1;
+    for(int i = 1; i < DEFAULT_FEATURES.length; i++) {
+        if(name.equalsIgnoreCase(DEFAULT_FEATURES[i])) {
+        index = i;
+        }
+    }
+    if(index == 1 || index == 3 || index == 5 || index == 7) {
+        return FLAG;
+    }
+    return VALUE;
+    }
+}

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

-              r4293
+              r4366
  */
 public class FormatManager
      extends DynamicListModel {
      /** The main manager so we can get to ClassifierManager which is needed to turn position reference such as "CL1" into the appropriate Classifier. */
      private CollectionDesignManager manager = null;
      /** The controls used to edit the format commands. */
      private Control controls = null;
      /** A reference to ourselves so inner classes can get at the model. */
      private DynamicListModel model = null;
      /** A reference to the Gatherer. */
      private Gatherer gatherer = null;
      /** We may have somehow recieved a format command which references a classifier that hasn't been parsed yet, so this variable holds a list of failed commands which are retried after the loading is complete. */
      private Vector unresolved_commands = null;
      /** Constructor.
       * @param gatherer A reference to the <strong>Gatherer</strong>.
       * @param manager A reference to the <strong>CollectionDesignManager</strong> that created this manager.
       */
      public FormatManager(Gatherer gatherer, CollectionDesignManager manager) {
           super();
           this.gatherer = gatherer;
           this.manager = manager;
           this.model = this;
           this.unresolved_commands = new Vector();
+     }
      /** Method to add a new format to this manager.
+    extends DynamicListModel {
+    /** The main manager so we can get to ClassifierManager which is needed to turn position reference such as "CL1" into the appropriate Classifier. */
+    private CollectionDesignManager manager = null;
+    /** The controls used to edit the format commands. */
+    private Control controls = null;
+    /** A reference to ourselves so inner classes can get at the model. */
+    private DynamicListModel model = null;
+    /** A reference to the Gatherer. */
+    private Gatherer gatherer = null;
+    /** We may have somehow recieved a format command which references a classifier that hasn't been parsed yet, so this variable holds a list of failed commands which are retried after the loading is complete. */
+    private Vector unresolved_commands = null;
+    /** Constructor.
+     * @param gatherer A reference to the <strong>Gatherer</strong>.
+     * @param manager A reference to the <strong>CollectionDesignManager</strong> that created this manager.
+     */
+    public FormatManager(Gatherer gatherer, CollectionDesignManager manager) {
+    super();
+    this.gatherer = gatherer;
+    this.manager = manager;
+    this.model = this;
+    this.unresolved_commands = new Vector();
+    }
+    /** Method to add a new format to this manager.
       * @param format The <strong>Format</strong> to add.
       */
      public void addFormat(Format format) {
           if(formatExists(format) == null) {
                 addElement(format);
                 gatherer.c_man.configurationChanged();
+          }
+     }
      /** Method which determines if a certain format exists, in which case it must be removed before a new format of the same component is added. For general formatting statements this compares types, for 'custom' ones it compares list and part.
+    public void addFormat(Format format) {
+    if(formatExists(format) == null) {
+        addElement(format);
+        gatherer.c_man.configurationChanged();
+    }
+    }
+    /** Method which determines if a certain format exists, in which case it must be removed before a new format of the same component is added. For general formatting statements this compares types, for 'custom' ones it compares list and part.
       * @param format The <strong>Format</strong> whose uniqueness we want to check.
       * @return The <strong>Format</strong> that matches the one given, or <i>null</i> if no such format exists.
       */
      public Format formatExists(Format format) {
           for(int i = 0; i < size(); i++) {
                 Format current = (Format) get(i);
                 if(format.getPosition().equals(current.getPosition())) {
                      return current;
+                }
+          }
           return null;
+     }
      /** Gets the format indicated by the index.
+    public Format formatExists(Format format) {
+    for(int i = 0; i < size(); i++) {
+        Format current = (Format) get(i);
+        if(format.getPosition().equals(current.getPosition())) {
+        return current;
+        }
+    }
+    return null;
+    }
+    /** Gets the format indicated by the index.
       * @param index The location of the desired format, as an <i>int</i>.
       */
      public Format getFormat(int index) {
           return (Format)get(index);
+     }
      /** Method to retrieve this managers controls.
+    public Format getFormat(int index) {
+    return (Format)get(index);
+    }
+    /** Method to retrieve this managers controls.
       * @return The <strong>Control</strong> for this collection.
       */
      public Control getControls() {
           if(controls == null) {
                 controls = new Control();
+          }
           return controls;
+     }
      /** Method to invalidate controls when some significant change has occured within the collection. */
      public void invalidateControls() {
           if(controls != null) {
                 controls.destroy();
+          }
           controls = null;
+     }
      /** This method attempts to parse a format command from the given string. If a format is parsed, it is immediately added to this managers list of format commands.
+    public Control getControls() {
+    if(controls == null) {
+        controls = new Control();
+    }
+    return controls;
+    }
+    /** Method to invalidate controls when some significant change has occured within the collection. */
+    public void invalidateControls() {
+    if(controls != null) {
+        controls.destroy();
+    }
+    controls = null;
+    }
+    /** This method attempts to parse a format command from the given string. If a format is parsed, it is immediately added to this managers list of format commands.
       * @param command The <strong>String</strong> we are trying to parse a command from.
       * @param finished A <i>boolean</i> which is <i>true</i> if we are calling this after the the input has been completely parsed (i.e all legal Classifiers are know to exist), or <i>false</i> otherwise.
 …
       * @see org.greenstone.gatherer.cdm.Format
       */
+     public boolean parse(String command, boolean finished) {
+          String temp = command.toLowerCase();
+          if(temp.startsWith("format")) {
+                if(finished) {
+                     CommandTokenizer ct = new CommandTokenizer(command);
+                     ct.nextToken(); // Throw away 'format'
+                     String position = ct.nextToken();
+                     String value = ct.nextToken();
+                     // String speech marks.
+                     if(value.startsWith("\"") && value.endsWith("\"")) {
+                          if(value.equals("\"\"")) {
+                                value = "";
+                          }
+                          else {
+                                value = value.substring(1, value.length() - 1);
+                          }
+                     }
+                     // Ensure we parsed a good command.
+                     if(position != null && value != null) {
+                          // The trickiest bit of parsing format commands is figuring out how much of the position is feature, and how much part. Since the parts are far less likely to change or be customized in any way, we'll try to match them first (except "" of course).
+                          String feature_name = null;
+                          String part = null;
+                          // If this works, then we're all finished. Yay.
+                          for(int i = 1; i < Format.DEFAULT_PARTS.length; i++) {
+                                if(position.endsWith(Format.DEFAULT_PARTS[i])) {
+                                     part = Format.DEFAULT_PARTS[i];
+                                     feature_name = position.substring(0, position.length() - part.length());
+                                }
+                          }
+                          // Otherwise we can attempt to find the default features, but we have less chance of success.
+                          if(feature_name == null || part == null) {
+                                for(int i = 1; i < Format.DEFAULT_FEATURES.length; i++) {
+                                     if(position.startsWith(Format.DEFAULT_FEATURES[i])) {
+                                          feature_name = Format.DEFAULT_FEATURES[i];
+                                          if(position.length() > feature_name.length()) {
+                                                part = position.substring(feature_name.length());
+                                          }
+                                          else {
+                                                part = "";
+                                          }
+                                     }
+                                }
+                          }
+                          // Otherwise we can assume we are dealing with a classifier and split the position using...
+                          // position            ::= <classifier_position><part>
+                          // classifier_position ::= <alphanum>[0-9]$
+                          // part                ::= ^![0-9]<alpha>
+                          // But I don't like my chances of this working if someone does a scary like CL4Part8B. I just have
+                          // to hope no-one uses numbers, and no-one expects CustomFeatureCustomPart to parse properly.
+                          if(feature_name == null || part == null) {
+                                part = "";
+                                boolean found = false;
+                                int index = position.length() - 1;
+                                while(index >= 0 && !found) {
+                                     if(Character.isDigit(position.charAt(index))) {
+                                          found = true;
+                                     }
+                                     else {
+                                          part = position.charAt(index) + part;
+                                          index--;
+                                     }
+                                }
+                                if(found) {
+                                     feature_name = position.substring(0, index + 1);
+                                }
+                                // We ran out of string. No digits. Arg!
+                                else {
+                                     part = null;
+                                }
+                          }
+                          // And if all else fails, stick it all in feature.
+                          if(feature_name == null || part == null) {
+                                feature_name = position;
+                                part = "";
+                          }
+                          // Now try to retrieve a classifier with the feature name.
+                          Object feature = null;
+                          String feature_name_lc = feature_name.toLowerCase();
+                          if(feature_name_lc.startsWith("cl") && feature_name.length() >= 3) {
+                                String raw_index = feature_name.substring(2); // Lose the 'CL'
+                                int index = -1;
+                                try {
+                                     index = Integer.parseInt(raw_index);
+                                }
+                                catch(NumberFormatException nfe) {
+                                     nfe.printStackTrace();
+                                }
+                                feature = manager.classifiers.getClassifier(index - 1);
+                          }
+                          else {
+                                ///ystem.err.println("name to short for classifier.");
+                          }
+                          if(feature == null) {
+                                feature = feature_name;
+                          }
+                          ///ystem.err.println("Feature name = " + feature_name + "\nPart = " + part);
+                          if(feature instanceof Classifier) {
+                                ///ystem.err.println("Feature is a classifier.");
+                          }
+                          else {
+                                ///ystem.err.println("Feature is a String.");
+                          }
+                          // Now we have a quick look at value. If its true or false we create a FLAG type
+                          if(value.equalsIgnoreCase("true")) {
+                                addFormat(new Format(feature, part, true));
+                          }
+                          else if(value.equalsIgnoreCase("false")) {
+                                addFormat(new Format(feature, part, false));
+                          }
+                          // Otherwise add a plain old value based format
+                          else {
+                                addFormat(new Format(feature, part, value));
+                          }
+                          return true;
+                     }
+                     // Somethings gone terribly, terribly wrong.
+                     return false;
+    public boolean parse(String command, boolean finished) {
+    String temp = command.toLowerCase();
+    if(temp.startsWith("format")) {
+        if(finished) {
+        CommandTokenizer ct = new CommandTokenizer(command);
+        ct.nextToken(); // Throw away 'format'
+        String position = ct.nextToken();
+        String value = ct.nextToken();
+        // String speech marks.
+        if(value.startsWith("\"") && value.endsWith("\"")) {
+            if(value.equals("\"\"")) {
+            value = "";
+            }
+            else {
+            value = value.substring(1, value.length() - 1);
+            }
+        }
+        // Ensure we parsed a good command.
+        if(position != null && value != null) {
+            // The trickiest bit of parsing format commands is figuring out how much of the position is feature, and how much part. Since the parts are far less likely to change or be customized in any way, we'll try to match them first (except "" of course).
+            String feature_name = null;
+            String part = null;
+            // If this works, then we're all finished. Yay.
+            for(int i = 1; i < Format.DEFAULT_PARTS.length; i++) {
+            if(position.endsWith(Format.DEFAULT_PARTS[i])) {
+                part = Format.DEFAULT_PARTS[i];
+                feature_name = position.substring(0, position.length() - part.length());
+            }
+            }
+            // Otherwise we can attempt to find the default features, but we have less chance of success.
+            if(feature_name == null || part == null) {
+            for(int i = 1; i < Format.DEFAULT_FEATURES.length; i++) {
+                if(position.startsWith(Format.DEFAULT_FEATURES[i])) {
+                feature_name = Format.DEFAULT_FEATURES[i];
+                if(position.length() > feature_name.length()) {
+                    part = position.substring(feature_name.length());
+                }
                 else {
                      unresolved_commands.add(command);
+                    part = "";
+                }
+                return true;
+          }
+          return false;
+     }
+     /** Method to remove a format.
+                }
+            }
+            }
+            // Otherwise we can assume we are dealing with a classifier and split the position using...
+            // position            ::= <classifier_position><part>
+            // classifier_position ::= <alphanum>[0-9]$
+            // part                ::= ^![0-9]<alpha>
+            // But I don't like my chances of this working if someone does a scary like CL4Part8B. I just have
+            // to hope no-one uses numbers, and no-one expects CustomFeatureCustomPart to parse properly.
+            if(feature_name == null || part == null) {
+            part = "";
+            boolean found = false;
+            int index = position.length() - 1;
+            while(index >= 0 && !found) {
+                if(Character.isDigit(position.charAt(index))) {
+                found = true;
+                }
+                else {
+                part = position.charAt(index) + part;
+                index--;
+                }
+            }
+            if(found) {
+                feature_name = position.substring(0, index + 1);
+            }
+            // We ran out of string. No digits. Arg!
+            else {
+                part = null;
+            }
+            }
+            // And if all else fails, stick it all in feature.
+            if(feature_name == null || part == null) {
+            feature_name = position;
+            part = "";
+            }
+            // Now try to retrieve a classifier with the feature name.
+            Object feature = null;
+            String feature_name_lc = feature_name.toLowerCase();
+            if(feature_name_lc.startsWith("cl") && feature_name.length() >= 3) {
+            String raw_index = feature_name.substring(2); // Lose the 'CL'
+            int index = -1;
+            try {
+                index = Integer.parseInt(raw_index);
+            }
+            catch(NumberFormatException nfe) {
+                nfe.printStackTrace();
+            }
+            feature = manager.classifiers.getClassifier(index - 1);
+            }
+            else {
+            ///ystem.err.println("name to short for classifier.");
+            }
+            if(feature == null) {
+            feature = feature_name;
+            }
+            ///ystem.err.println("Feature name = " + feature_name + "\nPart = " + part);
+            if(feature instanceof Classifier) {
+            ///ystem.err.println("Feature is a classifier.");
+            }
+            else {
+            ///ystem.err.println("Feature is a String.");
+            }
+            // Now we have a quick look at value. If its true or false we create a FLAG type
+            if(value.equalsIgnoreCase("true")) {
+            addFormat(new Format(feature, part, true));
+            }
+            else if(value.equalsIgnoreCase("false")) {
+            addFormat(new Format(feature, part, false));
+            }
+            // Otherwise add a plain old value based format
+            else {
+            addFormat(new Format(feature, part, value));
+            }
+            return true;
+        }
+        // Somethings gone terribly, terribly wrong.
+        return false;
+        }
+        else {
+        unresolved_commands.add(command);
+        }
+        return true;
+    }
+    return false;
+    }
+    /** Method to remove a format.
       * @param format The <strong>Format</strong> to remove.
       */
      public void removeFormat(Format format) {
           removeElement(format);
           gatherer.c_man.configurationChanged();
+     }
     /** Method which attempts to reparse obvious format commands which previously referenced unresovable Classifiers.
+    public void removeFormat(Format format) {
+    removeElement(format);
+    gatherer.c_man.configurationChanged();
+    }
+    /** Method which attempts to reparse obvious format commands which previously referenced unresovable Classifiers.
     */
     public void reparseUnresolved() {
         for(int i = 0; i < unresolved_commands.size(); i++) {
             if(!parse((String)unresolved_commands.get(i), true)) {
                  ///ystem.err.println("*** Error: Command " + unresolved_commands.get(i));
+            }
+        }
         // Regardless of if they work, clear the commands.
         unresolved_commands.clear();
+    }
     /** Method to produce a block of text representing the format commands in this manager, ready to be used in the collection configuration file.
+    public void reparseUnresolved() {
+    for(int i = 0; i < unresolved_commands.size(); i++) {
+        if(!parse((String)unresolved_commands.get(i), true)) {
+        ///ystem.err.println("*** Error: Command " + unresolved_commands.get(i));
+        }
+    }
+    // Regardless of if they work, clear the commands.
+    unresolved_commands.clear();
+    }
+    /** Method to produce a block of text representing the format commands in this manager, ready to be used in the collection configuration file.
     * @return A <strong>String</strong> containing a series of format commands.
     */
     public String toString() {
         StringBuffer text = new StringBuffer("");
         for(int i = 0; i < size(); i++) {
             Format format = (Format) get(i);
             text.append(format.toString());
             text.append("\n");
+        }
         text.append("\n");
         return text.toString();
+    }
      /** Overloaded to call get with both a key and an empty argument array.
+    public String toString() {
+    StringBuffer text = new StringBuffer("");
+    for(int i = 0; i < size(); i++) {
+        Format format = (Format) get(i);
+        text.append(format.toString());
+        text.append("\n");
+    }
+    text.append("\n");
+    return text.toString();
+    }
+    /** Overloaded to call get with both a key and an empty argument array.
       * @param key A <strong>String</strong> which is mapped to a initial String within the ResourceBundle.
       * @return A <strong>String</strong> which has been referenced by the key String and that either contains no argument fields, or has had the argument fields automatiically populated with formatting Strings of with argument String provided in the get call.
       */
      private String get(String key) {
           return get(key, null);
+     }
      /** Used to retrieve a property value from the Locale specific ResourceBundle, based upon the key and arguments supplied. If the key cannot be found or if some other part of the call fails a default (English) error message is returned. <BR>
+    private String get(String key) {
+    return get(key, null);
+    }
+    /** Used to retrieve a property value from the Locale specific ResourceBundle, based upon the key and arguments supplied. If the key cannot be found or if some other part of the call fails a default (English) error message is returned. <BR>
       * Here the get recieves a second argument which is an array of Strings used to populate argument fields, denoted {<I>n</I>}, within the value String returned. Note that argument numbers greater than or equal to 32 are automatically mapped to the formatting String named Farg<I>n</I>.
       * @param key A <strong>String</strong> which is mapped to a initial String within the ResourceBundle.
 …
       * @see org.greenstone.gatherer.Dictionary
       */
      private String get(String key, String args[]) {
           if(key.indexOf('.') == -1) {
                 key = "CDM.FormatManager." + key;
+          }
           return gatherer.dictionary.get(key, args);
+     }
      private class Control
           extends JPanel {
           /** Do we ignore selection changing events (mainly because we're generating them!) */
           private boolean ignore = false;
           private boolean new_entry = true;
           private boolean ready = false;
           private ButtonGroup button_group = null;
           private CardLayout card_layout = null;
           private Dimension LABEL_SIZE = new Dimension(175,25);
           private Format current_format = null;
           private String view_type = "custom";
           private JButton add = null;
           private JButton insert = null;
           private JButton preview = null;
           private JButton remove = null;
           private JComboBox feature = null;
           private JComboBox part = null;
           private JComboBox special = null;
           private JLabel editor_label = null;
           private JLabel feature_label = null;
           private JLabel format_list_label = null;
           private JLabel part_label = null;
           private JLabel special_label = null;
           private JLabel title = null;
           private JLabel value_label = null;
           private JList format_list = null;
           private JPanel blank_pane = null;
           private JPanel control_pane = null;
           private JPanel editor_pane = null;
           private JPanel feature_pane = null;
           private JPanel format_list_pane = null;
           private JPanel header_pane = null;
           private JPanel inner_button_pane = null;
           private JPanel inner_state_pane = null;
           private JPanel inner_value_pane = null;
           private JPanel options_pane = null;
           private JPanel outer_button_pane = null;
           private JPanel part_pane = null;
           private JPanel special_pane = null;
           private JPanel state_pane = null;
           private JPanel value_pane = null;
           private JPanel view_pane = null;
           private JTextArea editor = null;
           private JTextArea instructions = null;
           private JTextField value = null;
           private JToggleButton off = null;
           private JToggleButton on = null;
           private String BLANK = "blank";
           private String CUSTOM = "custom";
           private String FLAG = "flag";
           private String PARAM = "param";
           private Vector part_model = null;
           private Vector special_model = null;
           public Control() {
                 ArrayList feature_model = new ArrayList();
+    private String get(String key, String args[]) {
+    if(key.indexOf('.') == -1) {
+        key = "CDM.FormatManager." + key;
+    }
+    return gatherer.dictionary.get(key, args);
+    }
+    private class Control
+    extends JPanel {
+    /** Do we ignore selection changing events (mainly because we're generating them!) */
+    private boolean ignore = false;
+    private boolean new_entry = true;
+    private boolean ready = false;
+    private ButtonGroup button_group = null;
+    private CardLayout card_layout = null;
+    private Dimension LABEL_SIZE = new Dimension(175,25);
+    private Format current_format = null;
+    private String view_type = "custom";
+    private JButton add = null;
+    private JButton insert = null;
+    private JButton preview = null;
+    private JButton remove = null;
+    private JComboBox feature = null;
+    private JComboBox part = null;
+    private JComboBox special = null;
+    private JLabel editor_label = null;
+    private JLabel feature_label = null;
+    private JLabel format_list_label = null;
+    private JLabel part_label = null;
+    private JLabel special_label = null;
+    private JLabel title = null;
+    private JLabel value_label = null;
+    private JList format_list = null;
+    private JPanel blank_pane = null;
+    private JPanel control_pane = null;
+    private JPanel editor_pane = null;
+    private JPanel feature_pane = null;
+    private JPanel format_list_pane = null;
+    private JPanel header_pane = null;
+    private JPanel inner_button_pane = null;
+    private JPanel inner_state_pane = null;
+    private JPanel inner_value_pane = null;
+    private JPanel options_pane = null;
+    private JPanel outer_button_pane = null;
+    private JPanel part_pane = null;
+    private JPanel special_pane = null;
+    private JPanel state_pane = null;
+    private JPanel value_pane = null;
+    private JPanel view_pane = null;
+    private JTextArea editor = null;
+    private JTextArea instructions = null;
+    private JTextField value = null;
+    private JToggleButton off = null;
+    private JToggleButton on = null;
+    private String BLANK = "blank";
+    private String CUSTOM = "custom";
+    private String FLAG = "flag";
+    private String PARAM = "param";
+    private Vector part_model = null;
+    private Vector special_model = null;
+    public Control() {
+        ArrayList feature_model = new ArrayList();
                 // Add the set options
                 for(int i = 0; i < Format.DEFAULT_FEATURES.length; i++) {
                      feature_model.add(new Entry(Format.DEFAULT_FEATURES[i]));
+                }
+        for(int i = 0; i < Format.DEFAULT_FEATURES.length; i++) {
+        feature_model.add(new Entry(Format.DEFAULT_FEATURES[i]));
+        }
                 // Now the classifiers.
                 for(int j = 0; j < manager.classifiers.size(); j++) {
                      feature_model.add(new Entry(manager.classifiers.getClassifier(j)));
+                }
                 Collections.sort(feature_model);
                 part_model = new Vector();
                 part_model.add("");//get("Custom"));
                 part_model.add("DateList");
                 part_model.add("HList");
                 part_model.add("Invisible");
                 part_model.add("VList");
                 special_model = new Vector();
                 special_model.add("[Text]");
                 special_model.add("[link]");
                 special_model.add("[/link]");
                 special_model.add("[icon]");
                 special_model.add("[num]");
                 special_model.add("[parent():_]");
                 special_model.add("[parent(Top):_]");
                 special_model.add("[parent(All'_'):_]");
                 Vector elements = gatherer.c_man.msm.getAssignedElements();
                 for(int i = 0; i < elements.size(); i++) {
                      special_model.add("[" + ((ElementWrapper)elements.get(i)).toString() + "]");
+                }
                 Collections.sort(special_model);
+        for(int j = 0; j < manager.classifiers.size(); j++) {
+        feature_model.add(new Entry(manager.classifiers.getClassifier(j)));
+        }
+        Collections.sort(feature_model);
+        part_model = new Vector();
+        part_model.add("");//get("Custom"));
+        part_model.add("DateList");
+        part_model.add("HList");
+        part_model.add("Invisible");
+        part_model.add("VList");
+        special_model = new Vector();
+        special_model.add("[Text]");
+        special_model.add("[link]");
+        special_model.add("[/link]");
+        special_model.add("[icon]");
+        special_model.add("[num]");
+        special_model.add("[parent():_]");
+        special_model.add("[parent(Top):_]");
+        special_model.add("[parent(All'_'):_]");
+        Vector elements = gatherer.c_man.msm.getAssignedElements();
+        for(int i = 0; i < elements.size(); i++) {
+        special_model.add("[" + ((ElementWrapper)elements.get(i)).toString() + "]");
+        }
+        Collections.sort(special_model);
                 // Create
                 add = new JButton(get("Add"));
                 add.setEnabled(false);
                 blank_pane = new JPanel();
                 button_group = new ButtonGroup();
                 card_layout = new CardLayout();
                 control_pane = new JPanel();
                 editor = new JTextArea();
                 editor.setCaretPosition(0);
                 editor.setLineWrap(true);
                 editor.setWrapStyleWord(true);
                 editor_label = new JLabel(get("Editor"));
                 editor_label.setHorizontalAlignment(JLabel.CENTER);
                 editor_pane = new JPanel();
                 feature = new JComboBox(feature_model.toArray());
                 feature.setEditable(true);
                 feature_label = new JLabel(get("Feature"));
                 feature_label.setPreferredSize(LABEL_SIZE);
                 format_list = new JList(model);
                 format_list_label = new JLabel(get("Assigned_Formats"));
                 format_list_pane = new JPanel();
                 feature_pane = new JPanel();
                 header_pane = new JPanel();
                 inner_button_pane = new JPanel();
                 inner_state_pane = new JPanel();
                 inner_value_pane = new JPanel();
                 insert = new JButton(get("Insert"));
                 instructions = new JTextArea(get("Instructions"));
                 instructions.setBackground(Gatherer.config.getColor("coloring.collection_tree_background", false));
                 instructions.setEditable(false);
                 instructions.setLineWrap(true);
                 instructions.setRows(4);
                 instructions.setWrapStyleWord(true);
                 off = new JToggleButton(get("Off"));
                 off.setSelected(false);
                 on = new JToggleButton(get("On"));
                 on.setSelected(true);
                 options_pane = new JPanel();
                 outer_button_pane = new JPanel();
                 part = new JComboBox(part_model);
                 part.setEditable(true);
                 part_label = new JLabel(get("Part"));
                 part_label.setPreferredSize(LABEL_SIZE);
                 part_pane = new JPanel();
                 preview = new JButton(get("Preview"));
                 preview.setEnabled(false);
                 remove = new JButton(get("Remove"));
                 remove.setEnabled(false);
                 special = new JComboBox(special_model);
                 special_label = new JLabel(get("Special"));
                 special_label.setHorizontalAlignment(JLabel.CENTER);
                 special_pane = new JPanel();
                 state_pane = new JPanel();
                 title = new JLabel(get("Title"));
                 title.setHorizontalAlignment(JLabel.CENTER);
                 title.setOpaque(true);
                 value = new JTextField();
                 value_label = new JLabel(get("Value"));
                 value_pane = new JPanel();
                 view_pane = new JPanel();
+        add = new JButton(get("Add"));
+        add.setEnabled(false);
+        blank_pane = new JPanel();
+        button_group = new ButtonGroup();
+        card_layout = new CardLayout();
+        control_pane = new JPanel();
+        editor = new JTextArea();
+        editor.setCaretPosition(0);
+        editor.setLineWrap(true);
+        editor.setWrapStyleWord(true);
+        editor_label = new JLabel(get("Editor"));
+        editor_label.setHorizontalAlignment(JLabel.CENTER);
+        editor_pane = new JPanel();
+        feature = new JComboBox(feature_model.toArray());
+        feature.setEditable(true);
+        feature_label = new JLabel(get("Feature"));
+        feature_label.setPreferredSize(LABEL_SIZE);
+        format_list = new JList(model);
+        format_list_label = new JLabel(get("Assigned_Formats"));
+        format_list_pane = new JPanel();
+        feature_pane = new JPanel();
+        header_pane = new JPanel();
+        inner_button_pane = new JPanel();
+        inner_state_pane = new JPanel();
+        inner_value_pane = new JPanel();
+        insert = new JButton(get("Insert"));
+        instructions = new JTextArea(get("Instructions"));
+        instructions.setBackground(Gatherer.config.getColor("coloring.collection_tree_background", false));
+        instructions.setEditable(false);
+        instructions.setLineWrap(true);
+        instructions.setRows(4);
+        instructions.setWrapStyleWord(true);
+        off = new JToggleButton(get("Off"));
+        off.setSelected(false);
+        on = new JToggleButton(get("On"));
+        on.setSelected(true);
+        options_pane = new JPanel();
+        outer_button_pane = new JPanel();
+        part = new JComboBox(part_model);
+        part.setEditable(true);
+        part_label = new JLabel(get("Part"));
+        part_label.setPreferredSize(LABEL_SIZE);
+        part_pane = new JPanel();
+        preview = new JButton(get("Preview"));
+        preview.setEnabled(false);
+        remove = new JButton(get("Remove"));
+        remove.setEnabled(false);
+        special = new JComboBox(special_model);
+        special_label = new JLabel(get("Special"));
+        special_label.setHorizontalAlignment(JLabel.CENTER);
+        special_pane = new JPanel();
+        state_pane = new JPanel();
+        title = new JLabel(get("Title"));
+        title.setHorizontalAlignment(JLabel.CENTER);
+        title.setOpaque(true);
+        value = new JTextField();
+        value_label = new JLabel(get("Value"));
+        value_pane = new JPanel();
+        view_pane = new JPanel();
                 // Connect
                 add.addActionListener(new AddListener());
                 button_group.add(on);
                 button_group.add(off);
                 editor.addKeyListener(new EditorListener());
                 feature.addActionListener(new FeatureListener());
                 format_list.addListSelectionListener(new FormatListListener());
                 insert.addActionListener(new InsertListener());
                 off.addActionListener(new StateListener());
                 on.addActionListener(new StateListener());
                 part.addActionListener(new PartListener());
                 preview.addActionListener(new PreviewListener());
                 remove.addActionListener(new RemoveListener());
                 value.addKeyListener(new ValueListener());
+        add.addActionListener(new AddListener());
+        button_group.add(on);
+        button_group.add(off);
+        editor.addKeyListener(new EditorListener());
+        feature.addActionListener(new FeatureListener());
+        format_list.addListSelectionListener(new FormatListListener());
+        insert.addActionListener(new InsertListener());
+        off.addActionListener(new StateListener());
+        on.addActionListener(new StateListener());
+        part.addActionListener(new PartListener());
+        preview.addActionListener(new PreviewListener());
+        remove.addActionListener(new RemoveListener());
+        value.addKeyListener(new ValueListener());
                 // Layout
                 instructions.setBorder(BorderFactory.createEmptyBorder(2,5,2,5));
                 header_pane.setLayout(new BorderLayout());
                 header_pane.add(title, BorderLayout.NORTH);
                 header_pane.add(new JScrollPane(instructions), BorderLayout.CENTER);
                 format_list_label.setBorder(BorderFactory.createEmptyBorder(5,0,5,0));
                 format_list_pane.setLayout(new BorderLayout());
                 format_list_pane.add(format_list_label, BorderLayout.NORTH);
                 format_list_pane.add(new JScrollPane(format_list), BorderLayout.CENTER);
                 feature_label.setBorder(BorderFactory.createEmptyBorder(0,0,0,5));
                 feature_pane.setBorder(BorderFactory.createEmptyBorder(5,0,5,0));
                 feature_pane.setLayout(new BorderLayout());
                 feature_pane.add(feature_label, BorderLayout.WEST);
                 feature_pane.add(feature, BorderLayout.CENTER);
                 part_label.setBorder(BorderFactory.createEmptyBorder(0,0,0,5));
                 part_pane.setBorder(BorderFactory.createEmptyBorder(5,0,5,0));
                 part_pane.setLayout(new BorderLayout());
                 part_pane.add(part_label, BorderLayout.WEST);
                 part_pane.add(part, BorderLayout.CENTER);
                 options_pane.setLayout(new GridLayout(2,1));
                 options_pane.add(feature_pane);
                 options_pane.add(part_pane);
                 inner_state_pane = new JPanel(new GridLayout(1,2));
                 inner_state_pane.add(on);
                 inner_state_pane.add(off);
                 state_pane.setLayout(new BorderLayout());
                 state_pane.add(inner_state_pane, BorderLayout.NORTH);
                 state_pane.add(new JPanel(), BorderLayout.CENTER);
                 value_label.setBorder(BorderFactory.createEmptyBorder(0,0,0,5));
                 inner_value_pane.setLayout(new BorderLayout());
                 inner_value_pane.add(value_label, BorderLayout.WEST);
                 inner_value_pane.add(value, BorderLayout.CENTER);
                 value_pane.setLayout(new BorderLayout());
                 value_pane.add(inner_value_pane, BorderLayout.NORTH);
                 value_pane.add(new JPanel(), BorderLayout.CENTER);
                 special_pane.setLayout(new GridLayout(3,1));
                 special_pane.add(special_label);
                 special_pane.add(special);
                 special_pane.add(insert);
                 editor_pane.setLayout(new BorderLayout());
                 editor_pane.add(editor_label, BorderLayout.NORTH);
                 editor_pane.add(new JScrollPane(editor), BorderLayout.CENTER);
                 editor_pane.add(special_pane, BorderLayout.EAST);
+        instructions.setBorder(BorderFactory.createEmptyBorder(2,5,2,5));
+        header_pane.setLayout(new BorderLayout());
+        header_pane.add(title, BorderLayout.NORTH);
+        header_pane.add(new JScrollPane(instructions), BorderLayout.CENTER);
+        format_list_label.setBorder(BorderFactory.createEmptyBorder(5,0,5,0));
+        format_list_pane.setLayout(new BorderLayout());
+        format_list_pane.add(format_list_label, BorderLayout.NORTH);
+        format_list_pane.add(new JScrollPane(format_list), BorderLayout.CENTER);
+        feature_label.setBorder(BorderFactory.createEmptyBorder(0,0,0,5));
+        feature_pane.setBorder(BorderFactory.createEmptyBorder(5,0,5,0));
+        feature_pane.setLayout(new BorderLayout());
+        feature_pane.add(feature_label, BorderLayout.WEST);
+        feature_pane.add(feature, BorderLayout.CENTER);
+        part_label.setBorder(BorderFactory.createEmptyBorder(0,0,0,5));
+        part_pane.setBorder(BorderFactory.createEmptyBorder(5,0,5,0));
+        part_pane.setLayout(new BorderLayout());
+        part_pane.add(part_label, BorderLayout.WEST);
+        part_pane.add(part, BorderLayout.CENTER);
+        options_pane.setLayout(new GridLayout(2,1));
+        options_pane.add(feature_pane);
+        options_pane.add(part_pane);
+        inner_state_pane = new JPanel(new GridLayout(1,2));
+        inner_state_pane.add(on);
+        inner_state_pane.add(off);
+        state_pane.setLayout(new BorderLayout());
+        state_pane.add(inner_state_pane, BorderLayout.NORTH);
+        state_pane.add(new JPanel(), BorderLayout.CENTER);
+        value_label.setBorder(BorderFactory.createEmptyBorder(0,0,0,5));
+        inner_value_pane.setLayout(new BorderLayout());
+        inner_value_pane.add(value_label, BorderLayout.WEST);
+        inner_value_pane.add(value, BorderLayout.CENTER);
+        value_pane.setLayout(new BorderLayout());
+        value_pane.add(inner_value_pane, BorderLayout.NORTH);
+        value_pane.add(new JPanel(), BorderLayout.CENTER);
+        special_pane.setLayout(new GridLayout(3,1));
+        special_pane.add(special_label);
+        special_pane.add(special);
+        special_pane.add(insert);
+        editor_pane.setLayout(new BorderLayout());
+        editor_pane.add(editor_label, BorderLayout.NORTH);
+        editor_pane.add(new JScrollPane(editor), BorderLayout.CENTER);
+        editor_pane.add(special_pane, BorderLayout.EAST);
                 // Magic for view_pane card layout.
                 view_pane.setLayout(card_layout);
                 view_pane.add(editor_pane, CUSTOM);
                 view_pane.add(state_pane, FLAG);
+        view_pane.setLayout(card_layout);
+        view_pane.add(editor_pane, CUSTOM);
+        view_pane.add(state_pane, FLAG);
                 //view_pane.add(value_pane, PARAM);
                 inner_button_pane.setLayout(new GridLayout(1,2));
                 inner_button_pane.add(add);
                 inner_button_pane.add(remove);
                 outer_button_pane.setBorder(BorderFactory.createEmptyBorder(5,0,0,0));
                 outer_button_pane.setLayout(new GridLayout(1,1));
                 outer_button_pane.add(inner_button_pane);
+        inner_button_pane.setLayout(new GridLayout(1,2));
+        inner_button_pane.add(add);
+        inner_button_pane.add(remove);
+        outer_button_pane.setBorder(BorderFactory.createEmptyBorder(5,0,0,0));
+        outer_button_pane.setLayout(new GridLayout(1,1));
+        outer_button_pane.add(inner_button_pane);
                 //outer_button_pane.add(preview);
                 control_pane.setLayout(new BorderLayout());
                 control_pane.add(options_pane, BorderLayout.NORTH);
                 control_pane.add(view_pane, BorderLayout.CENTER);
                 control_pane.add(outer_button_pane, BorderLayout.SOUTH);
                 setBorder(BorderFactory.createEmptyBorder(5,5,5,5));
                 setLayout(new BorderLayout());
                 add(header_pane, BorderLayout.NORTH);
                 add(format_list_pane, BorderLayout.CENTER);
                 add(control_pane, BorderLayout.SOUTH);
                 ready = true;
+          }
           public void destroy() {
+          }
           /** Overriden to ensure that the instructions pane is scrolled to the top.
+        control_pane.setLayout(new BorderLayout());
+        control_pane.add(options_pane, BorderLayout.NORTH);
+        control_pane.add(view_pane, BorderLayout.CENTER);
+        control_pane.add(outer_button_pane, BorderLayout.SOUTH);
+        setBorder(BorderFactory.createEmptyBorder(5,5,5,5));
+        setLayout(new BorderLayout());
+        add(header_pane, BorderLayout.NORTH);
+        add(format_list_pane, BorderLayout.CENTER);
+        add(control_pane, BorderLayout.SOUTH);
+        ready = true;
+    }
+    public void destroy() {
+    }
+    /** Overriden to ensure that the instructions pane is scrolled to the top.
             */
           public void updateUI() {
                 if(ready) {
                      // Rebuild feature model.
                      ArrayList feature_model = new ArrayList();
                      // Add the set options
                      for(int i = 0; i < Format.DEFAULT_FEATURES.length; i++) {
                           feature_model.add(new Entry(Format.DEFAULT_FEATURES[i]));
+                     }
                      // Now the classifiers.
                      for(int j = 0; j < manager.classifiers.size(); j++) {
                           feature_model.add(new Entry(manager.classifiers.getClassifier(j)));
+                     }
                      feature.setModel(new DefaultComboBoxModel(feature_model.toArray()));
                      if(instructions != null) {
                           instructions.setCaretPosition(0);
+                     }
+                }
                 super.updateUI();
+          }
           /** Formats the formatting string so that it contains safe characters and isn't enclosed in speech marks etc. (Ironic eh?)
+    public void updateUI() {
+        if(ready) {
+        // Rebuild feature model.
+        ArrayList feature_model = new ArrayList();
+        // Add the set options
+        for(int i = 0; i < Format.DEFAULT_FEATURES.length; i++) {
+            feature_model.add(new Entry(Format.DEFAULT_FEATURES[i]));
+        }
+        // Now the classifiers.
+        for(int j = 0; j < manager.classifiers.size(); j++) {
+            feature_model.add(new Entry(manager.classifiers.getClassifier(j)));
+        }
+        feature.setModel(new DefaultComboBoxModel(feature_model.toArray()));
+        if(instructions != null) {
+            instructions.setCaretPosition(0);
+        }
+        }
+        super.updateUI();
+    }
+    /** Formats the formatting string so that it contains safe characters and isn't enclosed in speech marks etc. (Ironic eh?)
             * @see java.lang.StringBuffer
             */
           private String format(String raw) {
                 String safe = null;
                 if(raw != null && raw.length() > 0) {
                      StringBuffer temp = new StringBuffer(raw);
                      // Remove quotes at start and end. Look at my wiggly save three lines of code skills.
                      char start = ' ';
                      while(temp.length() > 0 && (start = temp.charAt(0)) == '\"' || start == '\'') {
                           temp.delete(0, 1);
+                     }
                      int length = 0;
                      char end = ' ';
                      while((length = temp.length()) > 0 && (end = temp.charAt(length - 1)) == '\"' || end == '\'') {
                           temp.delete(length - 1, length);
+                     }
                      // Now escape quotes within the format string
                      int quote_index = -1;
                      while((quote_index = temp.indexOf("\"", quote_index + 1)) != -1) {
                           temp.replace(quote_index, quote_index + 1, "\\\"");
                           quote_index = quote_index + 1;
+                     }
                      // Done.
                      safe = temp.toString();
+                }
                 return safe;
+          }
           /** Remove safe characters from string replacing them with unsafe ones.
+    private String format(String raw) {
+        String safe = null;
+        if(raw != null && raw.length() > 0) {
+        StringBuffer temp = new StringBuffer(raw);
+        // Remove quotes at start and end. Look at my wiggly save three lines of code skills.
+        char start = ' ';
+        while(temp.length() > 0 && (start = temp.charAt(0)) == '\"' || start == '\'') {
+            temp.delete(0, 1);
+        }
+        int length = 0;
+        char end = ' ';
+        while((length = temp.length()) > 0 && (end = temp.charAt(length - 1)) == '\"' || end == '\'') {
+            temp.delete(length - 1, length);
+        }
+        // Now escape quotes within the format string
+        int quote_index = -1;
+        while((quote_index = temp.indexOf("\"", quote_index + 1)) != -1) {
+            temp.replace(quote_index, quote_index + 1, "\\\"");
+            quote_index = quote_index + 1;
+        }
+        // Done.
+        safe = temp.toString();
+        }
+        return safe;
+    }
+    /** Remove safe characters from string replacing them with unsafe ones.
             * @see java.lang.StringBuffer
             */
           private String unformat(String safe) {
                 String raw = null;
                 if(safe != null && safe.length() > 0) {
                      StringBuffer temp = new StringBuffer(safe);
                      int quote_index = -1;
                      while((quote_index = temp.indexOf("\\\"")) != -1) {
                           temp.replace(quote_index, quote_index + 2, "\"");
+                     }
                      raw = temp.toString();
+                }
                 return raw;
+          }
           /** Listens for clicks on the add button, and if the relevant details are provided adds a new format. */
           private class AddListener
                 implements ActionListener {
                 public void actionPerformed(ActionEvent event) {
                      ignore = true;
                      Entry entry = (Entry)feature.getSelectedItem();
                      Object f = entry.getFeature();
                      String p = (String)part.getSelectedItem();
                      if(view_type.equals(FLAG)) {
                           current_format = new Format(f, p, on.isSelected());
+                     }
                      else {
                           current_format = new Format(f, p, format(Utility.stripNL(editor.getText())));
+                     }
                      addFormat(current_format);
                      add.setEnabled(false);
                      remove.setEnabled(true);
                      // Update list selection
                      format_list.setSelectedValue(current_format, true);
                      new_entry = false;
                      ignore = false;
+                }
+          }
           private class EditorListener
                 extends KeyAdapter {
                 public void keyReleased(KeyEvent event) {
                      String safe = format(editor.getText());
                      if(!ignore && current_format != null) {
                           // We have just performed an edit. Immediately update the format and model.
                           if(safe != null) {
                                 current_format.setValue(safe);
+                          }
                           else {
                                 current_format.setValue("");
+                          }
                           gatherer.c_man.configurationChanged();
                           model.refresh();
+                     }
                      Entry entry = (Entry) feature.getSelectedItem();
                      String name = entry.toString();
                      if(!(name.length() == 0 && ((String)part.getSelectedItem()).length() == 0) && safe != null && safe.length() != 0 && new_entry) {
                           add.setEnabled(true);
+                     }
                      else {
                           add.setEnabled(false);
+                     }
+                }
+          }
           /** This object provides a wrapping around an entry in the format target control, which is tranparent as to whether it is backed by a String or a Classifier. */
           private class Entry
                 implements Comparable {
                 private Classifier classifier = null;
                 private CustomClassifier custom_classifier = null;
                 private String text = null;
                 public Entry(Object object) {
                      if(object instanceof Classifier) {
                           classifier = (Classifier)object;
+                     }
                      if(object instanceof CustomClassifier) {
                           custom_classifier = (CustomClassifier)object;
+                     }
                      else if(object instanceof String) {
                           text = (String)object;
+                     }
                      else {
                           text = "";
+                     }
+                }
                 public Entry(String text) {
                      this.text = text;
+                }
                 public int compareTo(Object object) {
                      if(object == null) {
                           return 1;
+                     }
                      if(toString() == null) {
                           return -1;
+                     }
                      else {
                           String object_str = object.toString();
                           if(object_str == null) {
                                 return 1;
+                          }
                           return toString().compareTo(object_str);
+                     }
+                }
                 public boolean equals(Object object) {
                      if(compareTo(object) == 0) {
                           return true;
+                     }
                      return false;
+                }
                 public Classifier getClassifier() {
                      return classifier;
+                }
                 public CustomClassifier getCustomClassifier() {
                      return custom_classifier;
+                }
                 public Object getFeature() {
                      if(classifier != null) {
                           return classifier;
+                     }
                      return text;
+                }
                 public String toString() {
                      if(classifier != null) {
                           String name = classifier.toString();
                           return name.substring(9);
+                     }
                      if(custom_classifier != null) {
                           String name = custom_classifier.toString();
                           return name;//.substring(17);
+                     }
                      return text;
+                }
+          }
           private class FeatureListener
                 implements ActionListener {
                 public void actionPerformed(ActionEvent event) {
                      if(!ignore) {
                           current_format = null;
                           Entry entry = (Entry) feature.getSelectedItem();
                           String name = entry.toString();
                           int type = Format.getType(name);
                           switch(type) {
                           case Format.FLAG:
                                 // Flags first.
                                 part.setEnabled(false);
                                 part_pane.remove(part);
                                 card_layout.show(view_pane, FLAG);
                                 view_type = FLAG;
                                 add.setEnabled(true); // One of the options must be selected.
                                 break;
                           default:
                                 part.setEnabled(true);
                                 part_pane.add(part, BorderLayout.CENTER);
                                 card_layout.show(view_pane, CUSTOM);
                                 view_type = CUSTOM;
                                 if(!(name.length() == 0 && ((String)part.getSelectedItem()).length() == 0) && editor.getText().length() != 0) {
                                      add.setEnabled(true);
+                                }
                                 else {
                                      add.setEnabled(false);
+                                }
+                          }
                           control_pane.updateUI();
                           new_entry = true;
+                     }
+                }
+          }
           private class FormatListListener
                 implements ListSelectionListener {
                 public void valueChanged(ListSelectionEvent event) {
                      if(!ignore) {
                           if(!format_list.isSelectionEmpty()) {
                                 ignore = true;
                                 current_format = (Format)format_list.getSelectedValue();
                                 // Try to match the target, remembering the entries within are Entry's
                                 Entry an_entry = new Entry(current_format.getFeature());
                                 feature.setSelectedItem(an_entry);
                                 // Try to match the part.
                                 part.setSelectedItem(current_format.getPart());
                                 // Now use type to determine what controls are visible, and what have initial values.
                                 switch(current_format.getType()) {
                                 case Format.FLAG:
                                      // Flags first.
                                      part.setEnabled(false);
                                      part_pane.remove(part);
                                      card_layout.show(view_pane, FLAG);
                                      view_type = FLAG;
                                      // Initial value
                                      on.setSelected(current_format.getState());
                                      off.setSelected(!current_format.getState());
                                      add.setEnabled(false); // Can only update
                                      break;
                                 default:
                                      part.setEnabled(true);
                                      part_pane.add(part, BorderLayout.CENTER);
                                      card_layout.show(view_pane, CUSTOM);
                                      view_type = CUSTOM;
                                      // Initial value
                                      editor.setText(unformat(current_format.getValue()));
                                      add.setEnabled(false);
+                                }
                                 control_pane.updateUI();
                                 ignore = false;
                                 preview.setEnabled(true);
                                 remove.setEnabled(true);
                                 new_entry = false;
+                          }
                           else {
                                 preview.setEnabled(false);
                                 remove.setEnabled(false);
+                          }
+                     }
+                }
+          }
           private class InsertListener
                 implements ActionListener {
                 public void actionPerformed(ActionEvent event) {
                      editor.insert((String)special.getSelectedItem(), editor.getCaretPosition());
+                }
+          }
           private class PartListener
                 implements ActionListener {
                 public void actionPerformed(ActionEvent event) {
                      if(!ignore) {
                           current_format = null;
                           Entry entry = (Entry) feature.getSelectedItem();
                           String name = entry.toString();
                           if(!(name.length() == 0 && ((String)part.getSelectedItem()).length() == 0) && editor.getText().length() != 0) {
                                 add.setEnabled(true);
+                          }
                           else {
                                 add.setEnabled(false);
+                          }
                           new_entry = true;
+                     }
+                }
+          }
           private class PreviewListener
                 implements ActionListener {
                 public void actionPerformed(ActionEvent event) {
+                }
+          }
           private class RemoveListener
                 implements ActionListener {
                 public void actionPerformed(ActionEvent event) {
                      if(!format_list.isSelectionEmpty()) {
                           removeFormat((Format)format_list.getSelectedValue());
                           // Change buttons
                           add.setEnabled(true);
                           remove.setEnabled(false);
+                     }
+                }
+          }
           private class StateListener
                 implements ActionListener {
                 public void actionPerformed(ActionEvent event) {
                      if(!ignore && current_format != null) {
                           // We have just performed an edit. Immediately update the format and model.
                           current_format.setState(on.isSelected());
                           model.refresh();
+                     }
+                }
+          }
           private class ValueListener
                 extends KeyAdapter {
                 public void keyReleased(KeyEvent event) {
                      if(!ignore && current_format != null) {
                           // We have just performed an edit. Immediately update the format and model.
                           current_format.setValue(value.getText());
                           model.refresh();
+                     }
+                }
+          }
+     }
+    private String unformat(String safe) {
+        String raw = null;
+        if(safe != null && safe.length() > 0) {
+        StringBuffer temp = new StringBuffer(safe);
+        int quote_index = -1;
+        while((quote_index = temp.indexOf("\\\"")) != -1) {
+            temp.replace(quote_index, quote_index + 2, "\"");
+        }
+        raw = temp.toString();
+        }
+        return raw;
+    }
+    /** Listens for clicks on the add button, and if the relevant details are provided adds a new format. */
+    private class AddListener
+        implements ActionListener {
+        public void actionPerformed(ActionEvent event) {
+        ignore = true;
+        Entry entry = (Entry)feature.getSelectedItem();
+        Object f = entry.getFeature();
+        String p = (String)part.getSelectedItem();
+        if(view_type.equals(FLAG)) {
+            current_format = new Format(f, p, on.isSelected());
+        }
+        else {
+            current_format = new Format(f, p, format(Utility.stripNL(editor.getText())));
+        }
+        addFormat(current_format);
+        add.setEnabled(false);
+        remove.setEnabled(true);
+        // Update list selection
+        format_list.setSelectedValue(current_format, true);
+        new_entry = false;
+        ignore = false;
+        }
+    }
+    private class EditorListener
+        extends KeyAdapter {
+        public void keyReleased(KeyEvent event) {
+        String safe = format(editor.getText());
+        if(!ignore && current_format != null) {
+            // We have just performed an edit. Immediately update the format and model.
+            if(safe != null) {
+            current_format.setValue(safe);
+            }
+            else {
+            current_format.setValue("");
+            }
+            gatherer.c_man.configurationChanged();
+            model.refresh();
+        }
+        Entry entry = (Entry) feature.getSelectedItem();
+        String name = entry.toString();
+        if(!(name.length() == 0 && ((String)part.getSelectedItem()).length() == 0) && safe != null && safe.length() != 0 && new_entry) {
+            add.setEnabled(true);
+        }
+        else {
+            add.setEnabled(false);
+        }
+        }
+    }
+    /** This object provides a wrapping around an entry in the format target control, which is tranparent as to whether it is backed by a String or a Classifier. */
+    private class Entry
+        implements Comparable {
+        private Classifier classifier = null;
+        private CustomClassifier custom_classifier = null;
+        private String text = null;
+        public Entry(Object object) {
+        if(object instanceof Classifier) {
+            classifier = (Classifier)object;
+        }
+        if(object instanceof CustomClassifier) {
+            custom_classifier = (CustomClassifier)object;
+        }
+        else if(object instanceof String) {
+            text = (String)object;
+        }
+        else {
+            text = "";
+        }
+        }
+        public Entry(String text) {
+        this.text = text;
+        }
+        public int compareTo(Object object) {
+        if(object == null) {
+            return 1;
+        }
+        if(toString() == null) {
+            return -1;
+        }
+        else {
+            String object_str = object.toString();
+            if(object_str == null) {
+            return 1;
+            }
+            return toString().compareTo(object_str);
+        }
+        }
+        public boolean equals(Object object) {
+        if(compareTo(object) == 0) {
+            return true;
+        }
+        return false;
+        }
+        public Classifier getClassifier() {
+        return classifier;
+        }
+        public CustomClassifier getCustomClassifier() {
+        return custom_classifier;
+        }
+        public Object getFeature() {
+        if(classifier != null) {
+            return classifier;
+        }
+        return text;
+        }
+        public String toString() {
+        if(classifier != null) {
+            String name = classifier.toString();
+            return name.substring(9);
+        }
+        if(custom_classifier != null) {
+            String name = custom_classifier.toString();
+            return name;//.substring(17);
+        }
+        return text;
+        }
+    }
+    private class FeatureListener
+        implements ActionListener {
+        public void actionPerformed(ActionEvent event) {
+        if(!ignore) {
+            current_format = null;
+            Entry entry = (Entry) feature.getSelectedItem();
+            String name = entry.toString();
+            int type = Format.getType(name);
+            switch(type) {
+            case Format.FLAG:
+            // Flags first.
+            part.setEnabled(false);
+            part_pane.remove(part);
+            card_layout.show(view_pane, FLAG);
+            view_type = FLAG;
+            add.setEnabled(true); // One of the options must be selected.
+            break;
+            default:
+            part.setEnabled(true);
+            part_pane.add(part, BorderLayout.CENTER);
+            card_layout.show(view_pane, CUSTOM);
+            view_type = CUSTOM;
+            if(!(name.length() == 0 && ((String)part.getSelectedItem()).length() == 0) && editor.getText().length() != 0) {
+                add.setEnabled(true);
+            }
+            else {
+                add.setEnabled(false);
+            }
+            }
+            control_pane.updateUI();
+            new_entry = true;
+        }
+        }
+    }
+    private class FormatListListener
+        implements ListSelectionListener {
+        public void valueChanged(ListSelectionEvent event) {
+        if(!ignore) {
+            if(!format_list.isSelectionEmpty()) {
+            ignore = true;
+            current_format = (Format)format_list.getSelectedValue();
+            // Try to match the target, remembering the entries within are Entry's
+            Entry an_entry = new Entry(current_format.getFeature());
+            feature.setSelectedItem(an_entry);
+            // Try to match the part.
+            part.setSelectedItem(current_format.getPart());
+            // Now use type to determine what controls are visible, and what have initial values.
+            switch(current_format.getType()) {
+            case Format.FLAG:
+                // Flags first.
+                part.setEnabled(false);
+                part_pane.remove(part);
+                card_layout.show(view_pane, FLAG);
+                view_type = FLAG;
+                // Initial value
+                on.setSelected(current_format.getState());
+                off.setSelected(!current_format.getState());
+                add.setEnabled(false); // Can only update
+                break;
+            default:
+                part.setEnabled(true);
+                part_pane.add(part, BorderLayout.CENTER);
+                card_layout.show(view_pane, CUSTOM);
+                view_type = CUSTOM;
+                // Initial value
+                editor.setText(unformat(current_format.getValue()));
+                add.setEnabled(false);
+            }
+            control_pane.updateUI();
+            ignore = false;
+            preview.setEnabled(true);
+            remove.setEnabled(true);
+            new_entry = false;
+            }
+            else {
+            preview.setEnabled(false);
+            remove.setEnabled(false);
+            }
+        }
+        }
+    }
+    private class InsertListener
+        implements ActionListener {
+        public void actionPerformed(ActionEvent event) {
+        editor.insert((String)special.getSelectedItem(), editor.getCaretPosition());
+        }
+    }
+    private class PartListener
+        implements ActionListener {
+        public void actionPerformed(ActionEvent event) {
+        if(!ignore) {
+            current_format = null;
+            Entry entry = (Entry) feature.getSelectedItem();
+            String name = entry.toString();
+            if(!(name.length() == 0 && ((String)part.getSelectedItem()).length() == 0) && editor.getText().length() != 0) {
+            add.setEnabled(true);
+            }
+            else {
+            add.setEnabled(false);
+            }
+            new_entry = true;
+        }
+        }
+    }
+    private class PreviewListener
+        implements ActionListener {
+        public void actionPerformed(ActionEvent event) {
+        }
+    }
+    private class RemoveListener
+        implements ActionListener {
+        public void actionPerformed(ActionEvent event) {
+        if(!format_list.isSelectionEmpty()) {
+            removeFormat((Format)format_list.getSelectedValue());
+            // Change buttons
+            add.setEnabled(true);
+            remove.setEnabled(false);
+        }
+        }
+    }
+    private class StateListener
+        implements ActionListener {
+        public void actionPerformed(ActionEvent event) {
+        if(!ignore && current_format != null) {
+            // We have just performed an edit. Immediately update the format and model.
+            current_format.setState(on.isSelected());
+            model.refresh();
+        }
+        }
+    }
+    private class ValueListener
+        extends KeyAdapter {
+        public void keyReleased(KeyEvent event) {
+        if(!ignore && current_format != null) {
+            // We have just performed an edit. Immediately update the format and model.
+            current_format.setValue(value.getText());
+            model.refresh();
+        }
+        }
+    }
+    }
+}

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

-              r4293
+              r4366
 */
 public class GUI
      extends JPanel {
      /** A reference to the collection manager, as it is here that all of the other data members and managers reside. */
      private CollectionDesignManager manager = null;
      /** The controls used to modify the general options. */
      private Control controls = null;
      /** A tree to serve as a 'table of contents' for this design tool. We decided on a tree rather than a list, as it allows us to break sections into subsections if they become to complicated. */
      private DesignTree tree = null;
      /** A reference to the Gatherer. */
      private Gatherer gatherer = null;
      /** The title located just above the content tree. */
      private JLabel title = null;
      /** The panel containing both the title and the tree. */
      private JPanel tree_pane = null;
      /** The panel apon which is rendered the currently selected section screen. */
      private JPanel view = null;
      /** The available subscreens. */
      static final public String CONTENTS[] = {"General", "Indexes", "Subcollections", "Languages", "Plugins", "Classifiers", "Formats", "MetadataSets"};
      /** The preferred size of the collection design module screen real-estate. */
      static final private Dimension SIZE = new Dimension(760, 500);
      /** Constructor.
       * @see DesignTree
       * @see org.greenstone.gatherer.cdm.CollectionDesignManager
       */
      public GUI(Gatherer gatherer, CollectionDesignManager manager) {
           super();
           // Assignments
           this.gatherer = gatherer;
           this.manager = manager;
           // Creation
           this.title = new JLabel(get("Design_Topics"));
           this.tree = new DesignTree();
           this.tree_pane = new JPanel();
           this.view = getControls();
           // Connect
           tree.addTreeSelectionListener(new TreeListener());
           tree_pane.setLayout(new BorderLayout());
           tree_pane.add(title, BorderLayout.NORTH);
           tree_pane.add(new JScrollPane(tree), BorderLayout.CENTER);
           // Layout
           setBorder(BorderFactory.createEmptyBorder(10,10,10,10));
           setLayout(new BorderLayout());
           add(tree_pane, BorderLayout.WEST);
           add(view, BorderLayout.CENTER);
+     }
     /** Mark the current set of controls as invalid. If they are needed again in the future new controls will be generate.
+    extends JPanel {
+    /** A reference to the collection manager, as it is here that all of the other data members and managers reside. */
+    private CollectionDesignManager manager = null;
+    /** The controls used to modify the general options. */
+    private Control controls = null;
+    /** A tree to serve as a 'table of contents' for this design tool. We decided on a tree rather than a list, as it allows us to break sections into subsections if they become to complicated. */
+    private DesignTree tree = null;
+    /** A reference to the Gatherer. */
+    private Gatherer gatherer = null;
+    /** The title located just above the content tree. */
+    private JLabel title = null;
+    /** The panel containing both the title and the tree. */
+    private JPanel tree_pane = null;
+    /** The panel apon which is rendered the currently selected section screen. */
+    private JPanel view = null;
+    /** The available subscreens. */
+    static final public String CONTENTS[] = {"General", "Indexes", "Subcollections", "Languages", "Plugins", "Classifiers", "Formats", "MetadataSets"};
+    /** The preferred size of the collection design module screen real-estate. */
+    static final private Dimension SIZE = new Dimension(760, 500);
+    /** Constructor.
+     * @see DesignTree
+     * @see org.greenstone.gatherer.cdm.CollectionDesignManager
+     */
+    public GUI(Gatherer gatherer, CollectionDesignManager manager) {
+    super();
+    // Assignments
+    this.gatherer = gatherer;
+    this.manager = manager;
+    // Creation
+    this.title = new JLabel(get("Design_Topics"));
+    this.tree = new DesignTree();
+    this.tree_pane = new JPanel();
+    this.view = getControls();
+    // Connect
+    tree.addTreeSelectionListener(new TreeListener());
+    tree_pane.setLayout(new BorderLayout());
+    tree_pane.add(title, BorderLayout.NORTH);
+    tree_pane.add(new JScrollPane(tree), BorderLayout.CENTER);
+    // Layout
+    setBorder(BorderFactory.createEmptyBorder(10,10,10,10));
+    setLayout(new BorderLayout());
+    add(tree_pane, BorderLayout.WEST);
+    add(view, BorderLayout.CENTER);
+    }
+    /** Mark the current set of controls as invalid. If they are needed again in the future new controls will be generate.
     * @see org.greenstone.gatherer.cdm.GUI.Control
     */
      public void invalidateControls() {
           if(controls != null) {
                 controls.destroy();
+          }
           controls = null;
+     }
     /** Force the display to show a certain pane of controls.
+    public void invalidateControls() {
+    if(controls != null) {
+        controls.destroy();
+    }
+    controls = null;
+    }
+    /** Force the display to show a certain pane of controls.
     * @param type A <strong>String</strong> giving the name of the submanager view we wish to display.
     */
      public void setSelectedView(String type) {
           tree.setSelectedView(type);
+     }
     /** Overrides the normal updateUI to ensure that the current view also recieves an update message.
+    public void setSelectedView(String type) {
+    tree.setSelectedView(type);
+    }
+    /** Overrides the normal updateUI to ensure that the current view also recieves an update message.
     */
      public void updateUI() {
           if(view != null) {
                 view.updateUI();
+          }
           super.updateUI();
+     }
      /**Overridden so we can exit when window is closed
+    public void updateUI() {
+    if(view != null) {
+        view.updateUI();
+    }
+    super.updateUI();
+    }
+    /**Overridden so we can exit when window is closed
       * @param event A <strong>WindowsEvent</strong> that encapsulates all the information gathered about the event that called this method.
       * @see org.greenstone.gatherer.cdm.CollectionDesignManager
       */
      protected void processWindowEvent(WindowEvent event) {
           if(event.getID() == WindowEvent.WINDOW_CLOSING) {
                 manager.save();
                 System.exit(0);
+          }
+     }
      /** Overloaded to call get with both a key and an empty argument array.
+    protected void processWindowEvent(WindowEvent event) {
+    if(event.getID() == WindowEvent.WINDOW_CLOSING) {
+        manager.save();
+        System.exit(0);
+    }
+    }
+    /** Overloaded to call get with both a key and an empty argument array.
       * @param key A <strong>String</strong> which is mapped to a initial String within the ResourceBundle.
       * @return A <strong>String</strong> which has been referenced by the key String and that either contains no argument fields, or has had the argument fields automatiically populated with formatting Strings of with argument String provided in the get call.
       */
      private String get(String key) {
           return get(key, null);
+     }
      /** Used to retrieve a property value from the Locale specific ResourceBundle, based upon the key and arguments supplied. If the key cannot be found or if some other part of the call fails a default (English) error message is returned. <BR>
+    private String get(String key) {
+    return get(key, null);
+    }
+    /** Used to retrieve a property value from the Locale specific ResourceBundle, based upon the key and arguments supplied. If the key cannot be found or if some other part of the call fails a default (English) error message is returned. <BR>
       * Here the get recieves a second argument which is an array of Strings used to populate argument fields, denoted {<I>n</I>}, within the value String returned. Note that argument numbers greater than or equal to 32 are automatically mapped to the formatting String named Farg<I>n</I>.
       * @param key A <strong>String</strong> which is mapped to a initial String within the ResourceBundle.
 …
       * @see org.greenstone.gatherer.Dictionary
       */
      private String get(String key, String args[]) {
           if(key.indexOf('.') == -1) {
                 key = "CDM.GUI." + key;
+          }
           return gatherer.dictionary.get(key, args);
+     }
      /** Because the CollectionDesignManager has enough to do, this class is resposible for generating the controls for the general options, all of which are stored in the aforementioned manager.
+    private String get(String key, String args[]) {
+    if(key.indexOf('.') == -1) {
+        key = "CDM.GUI." + key;
+    }
+    return gatherer.dictionary.get(key, args);
+    }
+    /** Because the CollectionDesignManager has enough to do, this class is resposible for generating the controls for the general options, all of which are stored in the aforementioned manager.
       * @return A <strong>JPanel</strong> containing controls for editing the general options.
       */
      private JPanel getControls() {
           if(controls == null) {
                 controls = new Control();
+          }
           return controls;
+     }
      /** This class represents the visual component of the general options stored in the CollectionDesignManager. */
      private class Control
           extends JPanel {
             /** The collection metadata representing the extra or description of the collection. */
           private CollectionMeta collection_extra_data = null;
           /** The collection metadata representing the name of the collection. */
           private CollectionMeta collection_name_data = null;
           /** The collection metadata representing the icon file location of the collection. */
           private CollectionMeta icon_collection_data = null;
           /** The default size of label on this control. */
           private Dimension LABEL_SIZE = new Dimension(200,25);
           /** The checkbox controlling public access to the collection. */
           private JCheckBox access = null;
           /** The checkbox controlling the state of the collection. */
           private JCheckBox beta = null;
           /** The label denoting the collection extra area. */
           private JLabel collection_extra_label = null;
           /** The label denoting the collection extra language (Default). */
           private JLabel collection_extra_language = null;
           /** The label denoting the collection name area. */
           private JLabel collection_name_label = null;
           /** The label denoting the name language (Default). */
           private JLabel collection_name_language = null;
           /** The label denoting the collection icon area. */
           private JLabel icon_collection_label = null;
           /** The label denoting the icon language (Default). */
           private JLabel icon_collection_language = null;
           /** The label which serves as the title of this view. */
           private JLabel title = null;
           /** The panel containing the access controls. */
           private JPanel access_pane = null;
           /** The panel containing the state controls. */
           private JPanel beta_pane = null;
           /** The central pane that will contain the view. */
           private JPanel central_pane = null;
           /** A panel used to affect internal layout of the collection extra area. */
           private JPanel collection_extra_inner_pane = null;
           /** The panel containing the collection extra area. */
           private JPanel collection_extra_pane = null;
           /** A panel used to affect internal layout of the collection name area. */
           private JPanel collection_name_inner_pane = null;
           /** The panel containing the collection name area. */
           private JPanel collection_name_pane = null;
           /** A panel used to affect internal layout of the collection icon area. */
           private JPanel icon_collection_inner_pane = null;
           /** The panel containing the icon area. */
           private JPanel icon_collection_pane = null;
           /** A text area used to display the inline help for this manager. */
           private JTextArea instructions = null;
           /** The text field used to edit the collections title. */
           private JTextField collection_name = null;
           /** The text field used to edit the file name of the collections icon. */
           private JTextField icon_collection = null;
           /** A text area used to modify the collection description. */
           private JTextArea collection_extra = null;
           /** Constructor.
           * @see org.greenstone.gatherer.cdm.CollectionDesignManager
           * @see org.greenstone.gatherer.cdm.CollectionMeta
           * @see org.greenstone.gatherer.cdm.CollectionMetaManager
           * @see org.greenstone.gatherer.cdm.Language
           * @see org.greenstone.gatherer.cdm.LanguageManager
           */
           public Control() {
                 super();
                 collection_extra_data = manager.collectionmetadatum.getCollectionExtra();
                 collection_name_data = manager.collectionmetadatum.getCollectionName();
                 icon_collection_data = manager.collectionmetadatum.getIconCollection();
+    private JPanel getControls() {
+    if(controls == null) {
+        controls = new Control();
+    }
+    return controls;
+    }
+    /** This class represents the visual component of the general options stored in the CollectionDesignManager. */
+    private class Control
+    extends JPanel {
+    /** The collection metadata representing the extra or description of the collection. */
+    private CollectionMeta collection_extra_data = null;
+    /** The collection metadata representing the name of the collection. */
+    private CollectionMeta collection_name_data = null;
+    /** The collection metadata representing the icon file location of the collection. */
+    private CollectionMeta icon_collection_data = null;
+    /** The default size of label on this control. */
+    private Dimension LABEL_SIZE = new Dimension(200,25);
+    /** The checkbox controlling public access to the collection. */
+    private JCheckBox access = null;
+    /** The checkbox controlling the state of the collection. */
+    private JCheckBox beta = null;
+    /** The label denoting the collection extra area. */
+    private JLabel collection_extra_label = null;
+    /** The label denoting the collection extra language (Default). */
+    private JLabel collection_extra_language = null;
+    /** The label denoting the collection name area. */
+    private JLabel collection_name_label = null;
+    /** The label denoting the name language (Default). */
+    private JLabel collection_name_language = null;
+    /** The label denoting the collection icon area. */
+    private JLabel icon_collection_label = null;
+    /** The label denoting the icon language (Default). */
+    private JLabel icon_collection_language = null;
+    /** The label which serves as the title of this view. */
+    private JLabel title = null;
+    /** The panel containing the access controls. */
+    private JPanel access_pane = null;
+    /** The panel containing the state controls. */
+    private JPanel beta_pane = null;
+    /** The central pane that will contain the view. */
+    private JPanel central_pane = null;
+    /** A panel used to affect internal layout of the collection extra area. */
+    private JPanel collection_extra_inner_pane = null;
+    /** The panel containing the collection extra area. */
+    private JPanel collection_extra_pane = null;
+    /** A panel used to affect internal layout of the collection name area. */
+    private JPanel collection_name_inner_pane = null;
+    /** The panel containing the collection name area. */
+    private JPanel collection_name_pane = null;
+    /** A panel used to affect internal layout of the collection icon area. */
+    private JPanel icon_collection_inner_pane = null;
+    /** The panel containing the icon area. */
+    private JPanel icon_collection_pane = null;
+    /** A text area used to display the inline help for this manager. */
+    private JTextArea instructions = null;
+    /** The text field used to edit the collections title. */
+    private JTextField collection_name = null;
+    /** The text field used to edit the file name of the collections icon. */
+    private JTextField icon_collection = null;
+    /** A text area used to modify the collection description. */
+    private JTextArea collection_extra = null;
+    /** Constructor.
+     * @see org.greenstone.gatherer.cdm.CollectionDesignManager
+     * @see org.greenstone.gatherer.cdm.CollectionMeta
+     * @see org.greenstone.gatherer.cdm.CollectionMetaManager
+     * @see org.greenstone.gatherer.cdm.Language
+     * @see org.greenstone.gatherer.cdm.LanguageManager
+     */
+    public Control() {
+        super();
+        collection_extra_data = manager.collectionmetadatum.getCollectionExtra();
+        collection_name_data = manager.collectionmetadatum.getCollectionName();
+        icon_collection_data = manager.collectionmetadatum.getIconCollection();
                 // Creation.
                 access = new JCheckBox(get("CDM.General.Access"));
                 access.setSelected(manager.public_col);
                 access_pane = new JPanel();
                 beta = new JCheckBox(get("CDM.General.Beta"));
                 beta.setSelected(manager.beta);
                 beta_pane = new JPanel();
                 central_pane = new JPanel();
                 collection_extra = new JTextArea();
                 collection_extra_inner_pane = new JPanel();
                 collection_extra_label = new JLabel(get("CDM.General.Collection_Extra"));
                 collection_extra_label.setHorizontalAlignment(JLabel.CENTER);
                 collection_extra_language = new JLabel();
                 collection_extra_pane = new JPanel();
                 if(collection_extra_data != null) {
                      collection_extra.setText(collection_extra_data.getValue());
                      Language language = null;
                      if((language = collection_extra_data.getLanguage()) != null) {
                           collection_extra_language.setText(language.toString());
+                     }
                      else {
                           collection_extra_language.setText(manager.languages.getDefaultLanguage().toString());
+                     }
+                }
                 collection_name = new JTextField();
                 collection_name_inner_pane = new JPanel();
                 collection_name_label = new JLabel(get("CDM.General.Collection_Name"));
                 collection_name_label.setPreferredSize(LABEL_SIZE);
                 collection_name_language = new JLabel();
                 collection_name_pane = new JPanel();
                 if(collection_name_data != null) {
                      collection_name.setText(collection_name_data.getValue());
                      Language language = null;
                      if((language = collection_name_data.getLanguage()) != null) {
                           collection_name_language.setText(language.toString());
+                     }
                      else {
                           collection_name_language.setText(manager.languages.getDefaultLanguage().toString());
+                     }
+                }
                 icon_collection = new JTextField();
                 icon_collection_inner_pane = new JPanel();
                 icon_collection_label = new JLabel(get("CDM.General.Icon_Collection"));
                 icon_collection_label.setPreferredSize(LABEL_SIZE);
                 icon_collection_language = new JLabel();
                 icon_collection_pane = new JPanel();
                 if(icon_collection_data != null) {
                      icon_collection.setText(icon_collection_data.getValue());
                      Language language = null;
                      if((language = icon_collection_data.getLanguage()) != null) {
                           icon_collection_language.setText(language.toString());
+                     }
                      else {
                           icon_collection_language.setText(manager.languages.getDefaultLanguage().toString());
+                     }
+                }
                 instructions = new JTextArea(get("CDM.General.Instructions"));
                 instructions.setBackground(Gatherer.config.getColor("coloring.collection_tree_background", false));
                 instructions.setEditable(false);
                 instructions.setLineWrap(true);
                 instructions.setRows(4);
                 instructions.setWrapStyleWord(true);
                 JPanel lower = new JPanel();
                 title = new JLabel(get("CDM.General.Title"));
                 title.setHorizontalAlignment(JLabel.CENTER);
                 title.setOpaque(true);
                 JPanel upper = new JPanel();
+        access = new JCheckBox(get("CDM.General.Access"));
+        access.setSelected(manager.public_col);
+        access_pane = new JPanel();
+        beta = new JCheckBox(get("CDM.General.Beta"));
+        beta.setSelected(manager.beta);
+        beta_pane = new JPanel();
+        central_pane = new JPanel();
+        collection_extra = new JTextArea();
+        collection_extra_inner_pane = new JPanel();
+        collection_extra_label = new JLabel(get("CDM.General.Collection_Extra"));
+        collection_extra_label.setHorizontalAlignment(JLabel.CENTER);
+        collection_extra_language = new JLabel();
+        collection_extra_pane = new JPanel();
+        if(collection_extra_data != null) {
+        collection_extra.setText(collection_extra_data.getValue());
+        Language language = null;
+        if((language = collection_extra_data.getLanguage()) != null) {
+            collection_extra_language.setText(language.toString());
+        }
+        else {
+            collection_extra_language.setText(manager.languages.getDefaultLanguage().toString());
+        }
+        }
+        collection_name = new JTextField();
+        collection_name_inner_pane = new JPanel();
+        collection_name_label = new JLabel(get("CDM.General.Collection_Name"));
+        collection_name_label.setPreferredSize(LABEL_SIZE);
+        collection_name_language = new JLabel();
+        collection_name_pane = new JPanel();
+        if(collection_name_data != null) {
+        collection_name.setText(collection_name_data.getValue());
+        Language language = null;
+        if((language = collection_name_data.getLanguage()) != null) {
+            collection_name_language.setText(language.toString());
+        }
+        else {
+            collection_name_language.setText(manager.languages.getDefaultLanguage().toString());
+        }
+        }
+        icon_collection = new JTextField();
+        icon_collection_inner_pane = new JPanel();
+        icon_collection_label = new JLabel(get("CDM.General.Icon_Collection"));
+        icon_collection_label.setPreferredSize(LABEL_SIZE);
+        icon_collection_language = new JLabel();
+        icon_collection_pane = new JPanel();
+        if(icon_collection_data != null) {
+        icon_collection.setText(icon_collection_data.getValue());
+        Language language = null;
+        if((language = icon_collection_data.getLanguage()) != null) {
+            icon_collection_language.setText(language.toString());
+        }
+        else {
+            icon_collection_language.setText(manager.languages.getDefaultLanguage().toString());
+        }
+        }
+        instructions = new JTextArea(get("CDM.General.Instructions"));
+        instructions.setBackground(Gatherer.config.getColor("coloring.collection_tree_background", false));
+        instructions.setEditable(false);
+        instructions.setLineWrap(true);
+        instructions.setRows(4);
+        instructions.setWrapStyleWord(true);
+        JPanel lower = new JPanel();
+        title = new JLabel(get("CDM.General.Title"));
+        title.setHorizontalAlignment(JLabel.CENTER);
+        title.setOpaque(true);
+        JPanel upper = new JPanel();
                 // Add listeners.
                 access.addActionListener(new AccessListener());
                 beta.addActionListener(new BetaListener());
                 collection_extra.addKeyListener(new ChangeListener(collection_extra_data, collection_extra, "collectionextra"));
                 collection_name.addKeyListener(new ChangeListener(collection_name_data, collection_name, "collectionname"));
                 collection_name.addKeyListener(new CollectionTitleListener());
                 icon_collection.addKeyListener(new ChangeListener(icon_collection_data, icon_collection, "iconcollection"));
+        access.addActionListener(new AccessListener());
+        beta.addActionListener(new BetaListener());
+        collection_extra.addKeyListener(new ChangeListener(collection_extra_data, collection_extra, "collectionextra"));
+        collection_name.addKeyListener(new ChangeListener(collection_name_data, collection_name, "collectionname"));
+        collection_name.addKeyListener(new CollectionTitleListener());
+        icon_collection.addKeyListener(new ChangeListener(icon_collection_data, icon_collection, "iconcollection"));
                 // Layout
                 instructions.setBorder(BorderFactory.createEmptyBorder(2,5,2,5));
                 upper.setBorder(BorderFactory.createEmptyBorder(5,5,5,5));
                 upper.setLayout(new BorderLayout());
                 upper.add(title, BorderLayout.NORTH);
                 upper.add(new JScrollPane(instructions), BorderLayout.CENTER);
                 collection_name_label.setBorder(BorderFactory.createEmptyBorder(0,0,0,5));
                 collection_name_language.setBorder(BorderFactory.createEmptyBorder(0,5,0,0));
                 collection_name_inner_pane.setBorder(BorderFactory.createEmptyBorder(5,0,5,0));
                 collection_name_inner_pane.setLayout(new BorderLayout());
                 collection_name_inner_pane.add(collection_name);
                 collection_name_pane.setLayout(new BorderLayout());
                 collection_name_pane.add(collection_name_label, BorderLayout.WEST);
                 collection_name_pane.add(collection_name_inner_pane, BorderLayout.CENTER);
                 collection_name_pane.add(collection_name_language, BorderLayout.EAST);
                 icon_collection_label.setBorder(BorderFactory.createEmptyBorder(0,0,0,5));
                 icon_collection_language.setBorder(BorderFactory.createEmptyBorder(0,5,0,0));
                 icon_collection_inner_pane.setBorder(BorderFactory.createEmptyBorder(5,0,5,0));
                 icon_collection_inner_pane.setLayout(new BorderLayout());
                 icon_collection_inner_pane.add(icon_collection, BorderLayout.CENTER);
                 icon_collection_pane.setLayout(new BorderLayout());
                 icon_collection_pane.add(icon_collection_label, BorderLayout.WEST);
                 icon_collection_pane.add(icon_collection_inner_pane, BorderLayout.CENTER);
                 icon_collection_pane.add(icon_collection_language, BorderLayout.EAST);
                 access_pane.add(access);
                 beta_pane.add(beta);
                 lower.setBorder(BorderFactory.createEmptyBorder(0,5,5,5));
                 lower.setLayout(new GridLayout(6,1));
                 lower.add(manager.creator.getControls());
                 lower.add(manager.maintainer.getControls());
                 lower.add(access_pane);
                 lower.add(beta_pane);
                 lower.add(collection_name_pane);
                 lower.add(icon_collection_pane);
                 collection_extra_inner_pane.setLayout(new BorderLayout());
                 collection_extra_inner_pane.add(collection_extra_label, BorderLayout.WEST);
                 collection_extra_inner_pane.add(collection_extra_language, BorderLayout.EAST);
                 collection_extra.setBorder(BorderFactory.createEmptyBorder(2,5,2,5));
                 collection_extra_pane.setBorder(BorderFactory.createEmptyBorder(0,5,5,5));
                 collection_extra_pane.setLayout(new BorderLayout());
                 collection_extra_pane.add(collection_extra_inner_pane, BorderLayout.NORTH);
                 collection_extra_pane.add(new JScrollPane(collection_extra), BorderLayout.CENTER);
                 central_pane.setLayout(new BorderLayout());
                 central_pane.add(lower, BorderLayout.NORTH);
                 central_pane.add(collection_extra_pane, BorderLayout.CENTER);
                 setLayout(new BorderLayout());
                 add(upper, BorderLayout.NORTH);
                 add(central_pane, BorderLayout.CENTER);
+          }
           /** Destructor.
+        instructions.setBorder(BorderFactory.createEmptyBorder(2,5,2,5));
+        upper.setBorder(BorderFactory.createEmptyBorder(5,5,5,5));
+        upper.setLayout(new BorderLayout());
+        upper.add(title, BorderLayout.NORTH);
+        upper.add(new JScrollPane(instructions), BorderLayout.CENTER);
+        collection_name_label.setBorder(BorderFactory.createEmptyBorder(0,0,0,5));
+        collection_name_language.setBorder(BorderFactory.createEmptyBorder(0,5,0,0));
+        collection_name_inner_pane.setBorder(BorderFactory.createEmptyBorder(5,0,5,0));
+        collection_name_inner_pane.setLayout(new BorderLayout());
+        collection_name_inner_pane.add(collection_name);
+        collection_name_pane.setLayout(new BorderLayout());
+        collection_name_pane.add(collection_name_label, BorderLayout.WEST);
+        collection_name_pane.add(collection_name_inner_pane, BorderLayout.CENTER);
+        collection_name_pane.add(collection_name_language, BorderLayout.EAST);
+        icon_collection_label.setBorder(BorderFactory.createEmptyBorder(0,0,0,5));
+        icon_collection_language.setBorder(BorderFactory.createEmptyBorder(0,5,0,0));
+        icon_collection_inner_pane.setBorder(BorderFactory.createEmptyBorder(5,0,5,0));
+        icon_collection_inner_pane.setLayout(new BorderLayout());
+        icon_collection_inner_pane.add(icon_collection, BorderLayout.CENTER);
+        icon_collection_pane.setLayout(new BorderLayout());
+        icon_collection_pane.add(icon_collection_label, BorderLayout.WEST);
+        icon_collection_pane.add(icon_collection_inner_pane, BorderLayout.CENTER);
+        icon_collection_pane.add(icon_collection_language, BorderLayout.EAST);
+        access_pane.add(access);
+        beta_pane.add(beta);
+        lower.setBorder(BorderFactory.createEmptyBorder(0,5,5,5));
+        lower.setLayout(new GridLayout(6,1));
+        lower.add(manager.creator.getControls());
+        lower.add(manager.maintainer.getControls());
+        lower.add(access_pane);
+        lower.add(beta_pane);
+        lower.add(collection_name_pane);
+        lower.add(icon_collection_pane);
+        collection_extra_inner_pane.setLayout(new BorderLayout());
+        collection_extra_inner_pane.add(collection_extra_label, BorderLayout.WEST);
+        collection_extra_inner_pane.add(collection_extra_language, BorderLayout.EAST);
+        collection_extra.setBorder(BorderFactory.createEmptyBorder(2,5,2,5));
+        collection_extra_pane.setBorder(BorderFactory.createEmptyBorder(0,5,5,5));
+        collection_extra_pane.setLayout(new BorderLayout());
+        collection_extra_pane.add(collection_extra_inner_pane, BorderLayout.NORTH);
+        collection_extra_pane.add(new JScrollPane(collection_extra), BorderLayout.CENTER);
+        central_pane.setLayout(new BorderLayout());
+        central_pane.add(lower, BorderLayout.NORTH);
+        central_pane.add(collection_extra_pane, BorderLayout.CENTER);
+        setLayout(new BorderLayout());
+        add(upper, BorderLayout.NORTH);
+        add(central_pane, BorderLayout.CENTER);
+    }
+    /** Destructor.
             */
           public void destroy() {
+          }
           /** We override the updateUI method so that we can ensure we are scrolled to the top of the instructions box first.
+    public void destroy() {
+    }
+    /** We override the updateUI method so that we can ensure we are scrolled to the top of the instructions box first.
             */
           public void updateUI() {
                 if(instructions != null) {
                      instructions.setCaretPosition(0);
+                }
                 if(collection_extra != null) {
                      collection_extra.setCaretPosition(0);
+                }
                 super.updateUI();
+          }
           /** Detect when the collection access changes, and update the configuration as necessary.
+    public void updateUI() {
+        if(instructions != null) {
+        instructions.setCaretPosition(0);
+        }
+        if(collection_extra != null) {
+        collection_extra.setCaretPosition(0);
+        }
+        super.updateUI();
+    }
+    /** Detect when the collection access changes, and update the configuration as necessary.
           * @see org.greenstone.gatherer.cdm.CollectionDesignManager
           */
           private class AccessListener
                 implements ActionListener {
                 public void actionPerformed(ActionEvent event) {
                      manager.public_col = access.isSelected();
+                }
+          }
           /** Detect when the collection state changes and update the configuration as necessary.
+    private class AccessListener
+        implements ActionListener {
+        public void actionPerformed(ActionEvent event) {
+        manager.public_col = access.isSelected();
+        }
+    }
+    /** Detect when the collection state changes and update the configuration as necessary.
           * @see org.greenstone.gatherer.cdm.CollectionDesignManager
           */
           private class BetaListener
                 implements ActionListener {
                 public void actionPerformed(ActionEvent event) {
                      manager.beta = beta.isSelected();
+                }
+          }
           /** This class listens for any changes its registered controls, including enter actions and keys typed, and updates the fields stored in CollectionDesignManager as necessary. */
           private class ChangeListener
                 extends KeyAdapter {
+    private class BetaListener
+        implements ActionListener {
+        public void actionPerformed(ActionEvent event) {
+        manager.beta = beta.isSelected();
+        }
+    }
+    /** This class listens for any changes its registered controls, including enter actions and keys typed, and updates the fields stored in CollectionDesignManager as necessary. */
+    private class ChangeListener
+        extends KeyAdapter {
                 /** The collection metadata to alter. */
                 private CollectionMeta metadata = null;
+        private CollectionMeta metadata = null;
                 /** The control we are watching for changes. */
                 private JTextComponent component = null;
+        private JTextComponent component = null;
                 /** The name of the metadata to monitor. */
                 private String name = null;
+        private String name = null;
                 /** Construstor.
                 * @param metadata The <strong>CollectionMeta</strong> to alter.
                 * @param component The <strong>JTextComponent</strong> we are monitoring for changes.
                 * @param name The name of the metadata as a <strong>String</strong>.
+                 * @param metadata The <strong>CollectionMeta</strong> to alter.
+                 * @param component The <strong>JTextComponent</strong> we are monitoring for changes.
+                 * @param name The name of the metadata as a <strong>String</strong>.
                 */
                 public ChangeListener(CollectionMeta metadata, JTextComponent component, String name) {
                      this.component = component;
                      this.metadata = metadata;
                      if(metadata != null) {
                           this.name = metadata.getName().toString();
+                     }
                      else {
                           this.name = name;
+                     }
+                }
+        public ChangeListener(CollectionMeta metadata, JTextComponent component, String name) {
+        this.component = component;
+        this.metadata = metadata;
+        if(metadata != null) {
+            this.name = metadata.getName().toString();
+        }
+        else {
+            this.name = name;
+        }
+        }
                 /** Any extension of a KeyAdapter may override this method so we can be informed when a key has been released (ie after the character etc has been added). In this case we want to update the appropriate metadata, however there are three distinct cases to consider:<br>&nbsp;1. A simple update of the value field is all that is necessary,<br>&nbsp;2. The metadata exists but it currently has no language, so we must set the language to default and update the value, or<br>&nbsp;3. The metadata doesn't exist so we'll create a new one with the specified name, default language and new value.<br>This final case is highly unlikely but still possible.
                 * @param event An <strong>Event</strong> containing information about the key release.
 …
                 * @see org.greenstone.gatherer.collection.CollectionManager
                 */
                 public void keyReleased(KeyEvent event) {
                      if(metadata != null) {
                           Language language = metadata.getLanguage();
                           if(language == null) {
                                 metadata.update(metadata.getName(), manager.languages.getDefaultLanguage(), component.getText());
+                          }
                           else {
                                 metadata.update(metadata.getName(), metadata.getLanguage(), component.getText());
+                          }
+                     }
                      else {
                           metadata = new CollectionMeta(manager, name, manager.languages.getDefaultLanguage(), component.getText());
                           manager.collectionmetadatum.addMetadata(metadata);
+                     }
                      gatherer.c_man.configurationChanged();
+               }
+          }
           /** Listens for changes to the collection name and updates the windows title bar appropriately and collection file. */
           private class CollectionTitleListener
                 extends KeyAdapter {
+        public void keyReleased(KeyEvent event) {
+        if(metadata != null) {
+            Language language = metadata.getLanguage();
+            if(language == null) {
+            metadata.update(metadata.getName(), manager.languages.getDefaultLanguage(), component.getText());
+            }
+            else {
+            metadata.update(metadata.getName(), metadata.getLanguage(), component.getText());
+            }
+        }
+        else {
+            metadata = new CollectionMeta(manager, name, manager.languages.getDefaultLanguage(), component.getText());
+            manager.collectionmetadatum.addMetadata(metadata);
+        }
+        gatherer.c_man.configurationChanged();
+        }
+    }
+    /** Listens for changes to the collection name and updates the windows title bar appropriately and collection file. */
+    private class CollectionTitleListener
+        extends KeyAdapter {
                 /** Any extension of a KeyAdapter may override this method so we can be informed when a key has been released (ie after the character etc has been added). When such a change occurs update the main guis title bar to reflect the change and fix the collection name.
                  * @param event An <strong>Event</strong> containing information about the key release.
                  */
                 public void keyReleased(KeyEvent event) {
                      String name = collection_name.getText();
                      if(name != null && name.length() > 0) {
                           gatherer.g_man.setTitle(Utility.PROGRAM_NAME + ":\"" + name + "\"");
                           gatherer.c_man.getCollection().setTitle(name);
+                     }
+                }
+          }
+     }
      /** This tree provides a 'table of contents' for the various components of the design process (collection configuration in more technical terms). */
      private class DesignTree
           extends JTree {
           private DesignNode root = null;
           /** Constructor. Automatically generates all of the nodes, in the order of CONTENTS.
             */
           public DesignTree() {
                 super();
                 root = new DesignNode("Root");
                 this.setModel(new DefaultTreeModel(root));
+        public void keyReleased(KeyEvent event) {
+        String name = collection_name.getText();
+        if(name != null && name.length() > 0) {
+            gatherer.g_man.setTitle(Utility.PROGRAM_NAME + ":\"" + name + "\"");
+            gatherer.c_man.getCollection().setTitle(name);
+        }
+        }
+    }
+    }
+    /** This tree provides a 'table of contents' for the various components of the design process (collection configuration in more technical terms). */
+    private class DesignTree
+    extends JTree {
+    private DesignNode root = null;
+    /** Constructor. Automatically generates all of the nodes, in the order of CONTENTS.
+     */
+    public DesignTree() {
+        super();
+        root = new DesignNode("Root");
+        this.setModel(new DefaultTreeModel(root));
                 // Now add the design categories.
                 for(int i = 0; i < CONTENTS.length; i++) {
                      root.add(new DesignNode(CONTENTS[i]));
+                }
                 expandRow(0);
                 setRootVisible(false);
                 setSelectionRow(0);
+          }
             /** Set the current view to the one specified.
             * @param type The name of the desired view as a <strong>String</strong>.
             * @see org.greenstone.gatherer.Gatherer
             * @see org.greenstone.gatherer.cdm.GUI.DesignNode
             */
           public void setSelectedView(String type) {
                 type = gatherer.get(type);
                 for(int i = 0; i < root.getChildCount(); i++) {
                      DesignNode child = (DesignNode) root.getChildAt(i);
                      if(child.toString().equals(type)) {
                           TreePath path = new TreePath(child.getPath());
                           setSelectionPath(path);
+                     }
+                }
+          }
+     }
     /** A tree node that retains a reference to one of the possible design sub-views relating to the different sub-managers. */
      private class DesignNode
           extends DefaultMutableTreeNode {
           /** Constructor.
           * @param object The <strong>Object</strong> assigned to this node.
+        for(int i = 0; i < CONTENTS.length; i++) {
+        root.add(new DesignNode(CONTENTS[i]));
+        }
+        expandRow(0);
+        setRootVisible(false);
+        setSelectionRow(0);
+    }
+    /** Set the current view to the one specified.
+     * @param type The name of the desired view as a <strong>String</strong>.
+     * @see org.greenstone.gatherer.Gatherer
+     * @see org.greenstone.gatherer.cdm.GUI.DesignNode
+     */
+    public void setSelectedView(String type) {
+        type = gatherer.get(type);
+        for(int i = 0; i < root.getChildCount(); i++) {
+        DesignNode child = (DesignNode) root.getChildAt(i);
+        if(child.toString().equals(type)) {
+            TreePath path = new TreePath(child.getPath());
+            setSelectionPath(path);
+        }
+        }
+    }
+    }
+    /** A tree node that retains a reference to one of the possible design sub-views relating to the different sub-managers. */
+    private class DesignNode
+    extends DefaultMutableTreeNode {
+    /** Constructor.
+     * @param object The <strong>Object</strong> assigned to this node.
           */
           public DesignNode(String object) {
                 super(object);
+          }
           /** Retrieve a textual representation of the object.
+    public DesignNode(String object) {
+        super(object);
+    }
+    /** Retrieve a textual representation of the object.
           * @return A <strong>String</strong>.
           */
           public String toString() {
                 return get((String)getUserObject());
+          }
+     }
     /** Listens for selection changes in the 'contents' tree, and switches to the appropriate view. */
      private class TreeListener
           implements TreeSelectionListener {
           /** Called whenever the selection changes, we must update the view so it matches the node selected.
           * @param event A <strong>TreeSelectionEvent</strong> containing more information about the tree selection.
           * @see org.greenstone.gatherer.cdm.ClassifierManager
           * @see org.greenstone.gatherer.cdm.CollectionDesignManager
           * @see org.greenstone.gatherer.cdm.CollectionMetaManager
           * @see org.greenstone.gatherer.cdm.FormatManager
           * @see org.greenstone.gatherer.cdm.LanguageManager
           * @see org.greenstone.gatherer.cdm.MetadataSetManager
           * @see org.greenstone.gatherer.cdm.SubcollectionManager
           * @see org.greenstone.gatherer.cdm.PlugInManager
           */
           public void valueChanged(TreeSelectionEvent event) {
                 if(!tree.isSelectionEmpty()) {
                      TreePath path = tree.getSelectionPath();
                      DesignNode node = (DesignNode)path.getLastPathComponent();
                      String type = (String)node.getUserObject();
                      // Assure user
                      // Build and change panes.
                      remove(view);
                      view.hasFocus(); // Trigger pending information update events.
                      if(type.equals("General")) {
                           view = getControls();
+                     }
                      else if(type.equals("Indexes")) {
                           view = manager.indexes.getControls();
+                     }
                      else if(type.equals("Subcollections")) {
                           view = manager.subcollections.getControls();
+                     }
                      else if(type.equals("Languages")) {
                           view = manager.languages.getControls();
+                     }
                      else if(type.equals("Plugins")) {
                           view = manager.plugins.getControls();
+                     }
                      else if(type.equals("Classifiers")) {
                           view = manager.classifiers.getControls();
+                     }
                      else if(type.equals("Formats")) {
                           view = manager.formats.getControls();
+                     }
                      else if(type.equals("MetadataSets")) {
                           view = manager.metadatasets.getControls();
+                     }
                      add(view, BorderLayout.CENTER);
                      view.updateUI();
                      // Ready
+                }
+          }
+     }
+    public String toString() {
+        return get((String)getUserObject());
+    }
+    }
+    /** Listens for selection changes in the 'contents' tree, and switches to the appropriate view. */
+    private class TreeListener
+    implements TreeSelectionListener {
+    /** Called whenever the selection changes, we must update the view so it matches the node selected.
+     * @param event A <strong>TreeSelectionEvent</strong> containing more information about the tree selection.
+     * @see org.greenstone.gatherer.cdm.ClassifierManager
+     * @see org.greenstone.gatherer.cdm.CollectionDesignManager
+     * @see org.greenstone.gatherer.cdm.CollectionMetaManager
+     * @see org.greenstone.gatherer.cdm.FormatManager
+     * @see org.greenstone.gatherer.cdm.LanguageManager
+     * @see org.greenstone.gatherer.cdm.MetadataSetManager
+     * @see org.greenstone.gatherer.cdm.SubcollectionManager
+     * @see org.greenstone.gatherer.cdm.PlugInManager
+     */
+    public void valueChanged(TreeSelectionEvent event) {
+        if(!tree.isSelectionEmpty()) {
+        TreePath path = tree.getSelectionPath();
+        DesignNode node = (DesignNode)path.getLastPathComponent();
+        String type = (String)node.getUserObject();
+        // Assure user
+        // Build and change panes.
+        remove(view);
+        view.hasFocus(); // Trigger pending information update events.
+        if(type.equals("General")) {
+            view = getControls();
+        }
+        else if(type.equals("Indexes")) {
+            view = manager.indexes.getControls();
+        }
+        else if(type.equals("Subcollections")) {
+            view = manager.subcollections.getControls();
+        }
+        else if(type.equals("Languages")) {
+            view = manager.languages.getControls();
+        }
+        else if(type.equals("Plugins")) {
+            view = manager.plugins.getControls();
+        }
+        else if(type.equals("Classifiers")) {
+            view = manager.classifiers.getControls();
+        }
+        else if(type.equals("Formats")) {
+            view = manager.formats.getControls();
+        }
+        else if(type.equals("MetadataSets")) {
+            view = manager.metadatasets.getControls();
+        }
+        add(view, BorderLayout.CENTER);
+        view.updateUI();
+        // Ready
+        }
+    }
+    }
+}

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

-              r4293
+              r4366
 import org.w3c.dom.Element;
 /** This class encapsulates a single indexing pair.
 * @author John Thompson, Greenstone Digital Library, University of Waikato
 * @version 2.2
 */
+ * @author John Thompson, Greenstone Digital Library, University of Waikato
+ * @version 2.2
+ */
 public class Index
      implements Comparable {
      /** A refernce to the main manager for access to other sub-managers. */
      private CollectionDesignManager manager = null;
      /** The level of this index. */
      private int level = 0;
      /** The sources for data this index is built apon, which are either fully qualified metadata element names or 'text'. */
      private Vector sources = null;
      /** An element in the index level enumeration. */
      static public final int DOCUMENT = 0;
      /** An element in the index level enumeration. */
      static public final int PARAGRAPH = 1;
      /** An element in the index level enumeration. */
      static public final int SECTION = 2;
      /** An values of items in the index level enumeration. */
      static public final String LEVEL[] = {"document","paragraph","section"};
      /** Constructor.
       * @param level The level of this index as a <strong>String</string>.
       * @param metadata The fully qualified name of the metadata this index is built on as a <strong>String</strong>, or <i>null</i> in which case the data defaults to "text".
       */
      public Index(int level, Vector sources, CollectionDesignManager manager) {
           this.level = level;
           this.manager = manager;
           this.sources = sources;
           if(this.sources == null) {
                 this.sources = new Vector();
                 this.sources.add("text");
+          }
+     }
      /** Method to compare two indexes.
+    implements Comparable {
+    /** A refernce to the main manager for access to other sub-managers. */
+    private CollectionDesignManager manager = null;
+    /** The level of this index. */
+    private int level = 0;
+    /** The sources for data this index is built apon, which are either fully qualified metadata element names or 'text'. */
+    private Vector sources = null;
+    /** An element in the index level enumeration. */
+    static public final int DOCUMENT = 0;
+    /** An element in the index level enumeration. */
+    static public final int PARAGRAPH = 1;
+    /** An element in the index level enumeration. */
+    static public final int SECTION = 2;
+    /** An values of items in the index level enumeration. */
+    static public final String LEVEL[] = {"document","paragraph","section"};
+    /** Constructor.
+     * @param level The level of this index as a <strong>String</string>.
+     * @param metadata The fully qualified name of the metadata this index is built on as a <strong>String</strong>, or <i>null</i> in which case the data defaults to "text".
+     */
+    public Index(int level, Vector sources, CollectionDesignManager manager) {
+    this.level = level;
+    this.manager = manager;
+    this.sources = sources;
+    if(this.sources == null) {
+        this.sources = new Vector();
+        this.sources.add("text");
+    }
+    }
+    /** Method to compare two indexes.
       * @param object The other index as an <strong>Object</strong>.
       * @return An <i>int</i> which indicates how the indexes compare.
       * @see java.lang.String
       */
      public int compareTo(Object object) {
           if(object instanceof Index) {
                 Index index = (Index) object;
                 return toString(false).compareTo(index.toString(false));
+          }
           return toString(false).compareTo(object.toString());
+     }
      /** Method to test for the equality of two indexes.
+    public int compareTo(Object object) {
+    if(object instanceof Index) {
+        Index index = (Index) object;
+        return toString(false).compareTo(index.toString(false));
+    }
+    return toString(false).compareTo(object.toString());
+    }
+    /** Method to test for the equality of two indexes.
       * @param object The other index as an <strong>Object</strong>.
       * @return A <i>boolean</i> which is <i>true</i> if the two indexes are equal, <i>false</i> otherwise.
       */
      public boolean equals(Object object) {
           if(compareTo(object) == 0) {
                 return true;
+          }
           return false;
+     }
      /** Method to get the data source of this index.
+    public boolean equals(Object object) {
+    if(compareTo(object) == 0) {
+        return true;
+    }
+    return false;
+    }
+    /** Method to get the data source of this index.
       * @return A <strong>String</string> which is a comma separated list of either fully qualified names of an assigned metadata elements, or "text".
       */
      public String getData() {
           String result = "";
           Collections.sort(sources, new IndexComparator());
           for(int i = 0; i < sources.size(); i++) {
                 result = result + sources.get(i).toString();
                 if(i < sources.size() - 1) {
                      result = result + ",";
+                }
+          }
           return result;
+     }
      /** Method to get the value of level.
+    public String getData() {
+    String result = "";
+    Collections.sort(sources, new IndexComparator());
+    for(int i = 0; i < sources.size(); i++) {
+        result = result + sources.get(i).toString();
+        if(i < sources.size() - 1) {
+        result = result + ",";
+        }
+    }
+    return result;
+    }
+    /** Method to get the value of level.
       * @return The value of level as a <strong>String</strong>.
       */
      public int getLevel() {
           return level;
+     }
      /** Method to get the value of metadata.
+    public int getLevel() {
+    return level;
+    }
+    /** Method to get the value of metadata.
       * @return The value of metadata as an <strong>Vector</strong>.
       */
      public Vector getMetadata() {
           return sources;
+     }
      /** Method to retrieve this indexes name.
+    public Vector getMetadata() {
+    return sources;
+    }
+    /** Method to retrieve this indexes name.
       * @return A <strong>String</strong>.
       */
      public String getName() {
           if(manager != null) {
                 String name = LEVEL[level] + ":" + getData();
                 Language language = manager.languages.getDefaultLanguage();
                 CollectionMeta metadata = manager.collectionmetadatum.getMetadata(name, language, true);
                 if(metadata != null) {
                      return metadata.getValue();
+                }
+          }
           return "";
+     }
      /** Method to turn this object into a string representation ready to be placed in the collection configuration file.
+    public String getName() {
+    if(manager != null) {
+        String name = LEVEL[level] + ":" + getData();
+        Language language = manager.languages.getDefaultLanguage();
+        CollectionMeta metadata = manager.collectionmetadatum.getMetadata(name, language, true);
+        if(metadata != null) {
+        return metadata.getValue();
+        }
+    }
+    return "";
+    }
+    /** Method to turn this object into a string representation ready to be placed in the collection configuration file.
       * @return A <strong>String</strong> containing the information of this class.
       */
      public String toString() {
           return LEVEL[level] + ":" + getData() + "  \"" + getName() + "\"";
+     }
     /** Retrieve a textual representation of this index.
+    public String toString() {
+    return LEVEL[level] + ":" + getData() + "  \"" + getName() + "\"";
+    }
+    /** Retrieve a textual representation of this index.
     * @param show_name <i>true</i> if you want the name of this index, <i>false</i> for the gsdl index reference.
     */
      public String toString(boolean show_name) {
           if(show_name) {
                 return getName();
+          }
           return LEVEL[level] + ":" + getData();
+     }
     /** A custom comparator for comparing Indexes. */
      private class IndexComparator
           implements Comparator {
           /** Method to compare two objects, which may be either indexes or strings.
             * @param object1 One object as an <strong>Object</strong>.
             * @param object2 Another object as an <strong>Object</strong>.
             * @return An <i>int</i> which indicates how they compare.
             * @see java.lang.String
             */
           public int compare(Object object1, Object object2) {
                 if(object1 instanceof Index && object2 instanceof Index) {
                      Index index1 = (Index)object1;
                      Index index2 = (Index)object2;
                      return index1.toString(false).compareTo(index2.toString(false));
+                }
                 else if(object1 instanceof Index) {
                      Index index = (Index) object1;
                      return index.toString(false).compareTo(object2.toString());
+                }
                 else if(object2 instanceof Index) {
                      Index index = (Index) object2;
                      return object1.toString().compareTo(index.toString(false));
+                }
                 return object1.toString().compareTo(object2.toString());
+          }
           /** Method to test for the equality of two objects, which may be indexes or strings.
+    public String toString(boolean show_name) {
+    if(show_name) {
+        return getName();
+    }
+    return LEVEL[level] + ":" + getData();
+    }
+    /** A custom comparator for comparing Indexes. */
+    private class IndexComparator
+    implements Comparator {
+    /** Method to compare two objects, which may be either indexes or strings.
+     * @param object1 One object as an <strong>Object</strong>.
+     * @param object2 Another object as an <strong>Object</strong>.
+     * @return An <i>int</i> which indicates how they compare.
+     * @see java.lang.String
+     */
+    public int compare(Object object1, Object object2) {
+        if(object1 instanceof Index && object2 instanceof Index) {
+        Index index1 = (Index)object1;
+        Index index2 = (Index)object2;
+        return index1.toString(false).compareTo(index2.toString(false));
+        }
+        else if(object1 instanceof Index) {
+        Index index = (Index) object1;
+        return index.toString(false).compareTo(object2.toString());
+        }
+        else if(object2 instanceof Index) {
+        Index index = (Index) object2;
+        return object1.toString().compareTo(index.toString(false));
+        }
+        return object1.toString().compareTo(object2.toString());
+    }
+    /** Method to test for the equality of two objects, which may be indexes or strings.
             * @param object Another object as an <strong>Object</strong>.
             * @return A <i>boolean</i> which is <i>true</i> if the two objects are equal, <i>false</i> otherwise.
             */
           public boolean equals(Object object) {
                 if(compareTo(object) == 0) {
                      return true;
+                }
                 return false;
+          }
+     }
+    public boolean equals(Object object) {
+        if(compareTo(object) == 0) {
+        return true;
+        }
+        return false;
+    }
+    }
+}

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

-              r4293
+              r4366
 import org.w3c.dom.Element;
 /** This class is resposible for storing the indexes which have been assigned to this collection and the default index, and providing methods for interacting with both these data pools. It also knows how to turn itself into a String as it would be displayed in the collection configuration file.
 * @author John Thompson, Greenstone Digital Library, University of Waikato
 * @version 2.3
 */
+ * @author John Thompson, Greenstone Digital Library, University of Waikato
+ * @version 2.3
+ */
 public class IndexManager
      extends DefaultListModel {
      /** A reference to our creator, the collection design manager. */
      private CollectionDesignManager manager = null;
      /** The controls for editing the indexes. */
      private Control controls = null;
      /** A reference to ourselves so our inner methods have access. */
      private DefaultListModel model = null;
      /** A reference to the Gatherer, for access to the Dictionary and messaging purposes. */
      private Gatherer gatherer = null;
      /** The default index. */
      private Index default_index = null;
      /** Constructor.
      * @param gatherer A reference to the <strong>Gatherer</strong>.
      * @param manager A reference to the <strong>CollectionDesignManager</strong>.
      */
      public IndexManager(Gatherer gatherer, CollectionDesignManager manager) {
           super();
           this.gatherer = gatherer;
           this.manager = manager;
           this.model = this;
+     }
      /** Method to add a new index.
+    extends DefaultListModel {
+    /** A reference to our creator, the collection design manager. */
+    private CollectionDesignManager manager = null;
+    /** The controls for editing the indexes. */
+    private Control controls = null;
+    /** A reference to ourselves so our inner methods have access. */
+    private DefaultListModel model = null;
+    /** A reference to the Gatherer, for access to the Dictionary and messaging purposes. */
+    private Gatherer gatherer = null;
+    /** The default index. */
+    private Index default_index = null;
+    /** Constructor.
+     * @param gatherer A reference to the <strong>Gatherer</strong>.
+     * @param manager A reference to the <strong>CollectionDesignManager</strong>.
+     */
+    public IndexManager(Gatherer gatherer, CollectionDesignManager manager) {
+    super();
+    this.gatherer = gatherer;
+    this.manager = manager;
+    this.model = this;
+    }
+    /** Method to add a new index.
       * @param index The <strong>Index</strong> to add.
       * @see org.greenstone.gatherer.Gatherer
       * @see org.greenstone.gatherer.collection.CollectionManager
       */
      public void addIndex(Index index) {
           if(!contains(index)) {
                 String index_str = index.toString(false).toLowerCase();
+    public void addIndex(Index index) {
+    if(!contains(index)) {
+        String index_str = index.toString(false).toLowerCase();
                 // Add alphabetically.
                 for(int i = 0; i < size(); i++) {
                      Index sibling = (Index) get(i);
                      String sibling_str = sibling.toString(false).toLowerCase();
                      int position = index_str.compareTo(sibling_str);
                      // Sibling is before index.
                      if(position > 0) {
                           // Carry on.
+                     }
                      // Index is equal to, or before sibling. Insert it.
                      else if(position == 0 || position < 0) {
                           add(i, index);
                           gatherer.c_man.configurationChanged();
                           return;
+                     }
+                }
+        for(int i = 0; i < size(); i++) {
+        Index sibling = (Index) get(i);
+        String sibling_str = sibling.toString(false).toLowerCase();
+        int position = index_str.compareTo(sibling_str);
+        // Sibling is before index.
+        if(position > 0) {
+            // Carry on.
+        }
+        // Index is equal to, or before sibling. Insert it.
+        else if(position == 0 || position < 0) {
+            add(i, index);
+            gatherer.c_man.configurationChanged();
+            return;
+        }
+        }
                 // If we got this far, we haven't inserted index, and we are out of model so.
                 addElement(index);
                 gatherer.c_man.configurationChanged();
+          }
           else {
                 JOptionPane.showMessageDialog(manager.gui, get("CDM.IndexManager.Index_Exists"), get("General.Warning"), JOptionPane.WARNING_MESSAGE);
+          }
+     }
      /** Method to acquire the controls for editing the indexes.
+        addElement(index);
+        gatherer.c_man.configurationChanged();
+    }
+    else {
+        JOptionPane.showMessageDialog(manager.gui, get("CDM.IndexManager.Index_Exists"), get("General.Warning"), JOptionPane.WARNING_MESSAGE);
+    }
+    }
+    /** Method to acquire the controls for editing the indexes.
       * @return A <strong>JPanel</strong> containing the controls.
       * @see org.greenstone.gatherer.cdm.IndexManager.Control
       */
      public JPanel getControls() {
           if(controls == null) {
                 controls = new Control();
+          }
           return controls;
+     }
      /** Method to get the default index.
+    public JPanel getControls() {
+    if(controls == null) {
+        controls = new Control();
+    }
+    return controls;
+    }
+    /** Method to get the default index.
       * @return The default <strong>Index</strong>.
       */
      public Index getDefault() {
           return default_index;
+     }
      /** Method to retrieve a certain index, as referenced by an index number.
+    public Index getDefault() {
+    return default_index;
+    }
+    /** Method to retrieve a certain index, as referenced by an index number.
       * @param index An <i>int</i> which indicates the position of the desired index.
       * @return The <strong>Index</strong> at the given index, or <i>null</i> if no such index exists.
       */
      public Index getIndex(int index) {
           if(0 <= index && index < size()) {
                 return (Index)get(index);
+          }
           return null;
+     }
      /** Method to retrieve a certain index, given its name.
+    public Index getIndex(int index) {
+    if(0 <= index && index < size()) {
+        return (Index)get(index);
+    }
+    return null;
+    }
+    /** Method to retrieve a certain index, given its name.
       * @param name The name of the index as a <Strong>String</strong>.
       * @return The <strong>Index</strong> that matches name, or <i>null</i> if no such index exists.
       */
      public Index getIndex(String name) {
           ///ystem.err.println("Searching for index " + name);
           for(int i = 0; i < size(); i++) {
                 Index index = (Index) get(i);
                 if(index.toString(false).equals(name)) {
                      ///ystem.err.println("Found.");
                      return (Index)get(i);
+                }
+          }
           ///ystem.err.println("No such index.");
           return null;
+     }
      /** A method to retrieve all of the indexes associated with this manager.
+    public Index getIndex(String name) {
+    ///ystem.err.println("Searching for index " + name);
+    for(int i = 0; i < size(); i++) {
+        Index index = (Index) get(i);
+        if(index.toString(false).equals(name)) {
+        ///ystem.err.println("Found.");
+        return (Index)get(i);
+        }
+    }
+    ///ystem.err.println("No such index.");
+    return null;
+    }
+    /** A method to retrieve all of the indexes associated with this manager.
       * @return A <strong>Vector</strong> of <strong>Index</strong>es.
       */
      public Vector getIndexes() {
           Vector indexes = new Vector();
           for(int i = 0; i < size(); i++) {
                 indexes.add(get(i));
+          }
           Collections.sort(indexes);
           return indexes;
+     }
     /** Mark the current set of controls, if any, as obsolete and deallocate them. If further need of the controls will cause new controls to be created.
+    public Vector getIndexes() {
+    Vector indexes = new Vector();
+    for(int i = 0; i < size(); i++) {
+        indexes.add(get(i));
+    }
+    Collections.sort(indexes);
+    return indexes;
+    }
+    /** Mark the current set of controls, if any, as obsolete and deallocate them. If further need of the controls will cause new controls to be created.
     * @see org.greenstone.gatherer.cdm.IndexManager.Control
     */
      public void invalidateControls() {
           if(controls != null) {
                 controls.destroy();
+          }
           controls = null;
+     }
      /** Method that attempts to parse an index related command from the given command. If such a command is parsed, it is immediately registered with this manager.
+    public void invalidateControls() {
+    if(controls != null) {
+        controls.destroy();
+    }
+    controls = null;
+    }
+    /** Method that attempts to parse an index related command from the given command. If such a command is parsed, it is immediately registered with this manager.
       * @param command The <strong>String</strong> to parse.
       * @return A <i>boolean</i> which is <i>true</i> if a command was parsed, <i>false</i> otherwise.
 …
       * @see org.greenstone.gatherer.cdm.Index
       */
      public boolean parse(String command) {
           String temp = command.toLowerCase();
           if(temp.startsWith("indexes")) {
                 CommandTokenizer ct = new CommandTokenizer(command);
                 ct.nextToken(); // Throw away indexes.
                 while(ct.hasMoreTokens()) {
                      String entry = ct.nextToken();
                      if(entry.indexOf(":") != -1) {
                           String level_str = entry.substring(0, entry.indexOf(":"));
                           String sources_raw = entry.substring(entry.indexOf(":") + 1);
                           Vector sources = new Vector();
                           StringTokenizer st = new StringTokenizer(sources_raw, ",");
                           while(st.hasMoreTokens()) {
                                 String token = st.nextToken();
                                 // We may have to replace old : with whatever namespace separator we are using.
                                 token = token.replace(':', MSMUtils.NS_SEP);
                                 sources.add(token);
+                          }
                           for(int i = 0; i < Index.LEVEL.length; i++) {
                                 if(level_str.equals(Index.LEVEL[i])) {
                                      addIndex(new Index(i, sources, manager));
+                                }
+                          }
+                     }
                      else {
                           return false;
+                     }
+                }
                 return true;
+          }
           else if(temp.startsWith("defaultindex")) {
                 CommandTokenizer ct = new CommandTokenizer(command);
                 ct.nextToken();
                 String entry = ct.nextToken();
                 if(entry.indexOf(":") != -1) {
                      String level_str = entry.substring(0, entry.indexOf(":"));
                      String sources_raw = entry.substring(entry.indexOf(":") + 1);
                      Vector sources = new Vector();
                      StringTokenizer st = new StringTokenizer(sources_raw, ",");
                      while(st.hasMoreTokens()) {
                           sources.add(st.nextToken());
+                     }
                      for(int i = 0; i < Index.LEVEL.length; i++) {
                           if(level_str.equals(Index.LEVEL[i])) {
                                 setDefault(new Index(i, sources, manager));
+                          }
+                     }
+                }
                 else {
                      return false;
+                }
                 return true;
+          }
           return false;
+     }
      public void removeAll() {
           removeAllElements();
           default_index = null;
           gatherer.c_man.configurationChanged();
+     }
      /** Method to remove a certain index.
+    public boolean parse(String command) {
+    String temp = command.toLowerCase();
+    if(temp.startsWith("indexes")) {
+        CommandTokenizer ct = new CommandTokenizer(command);
+        ct.nextToken(); // Throw away indexes.
+        while(ct.hasMoreTokens()) {
+        String entry = ct.nextToken();
+        if(entry.indexOf(":") != -1) {
+            String level_str = entry.substring(0, entry.indexOf(":"));
+            String sources_raw = entry.substring(entry.indexOf(":") + 1);
+            Vector sources = new Vector();
+            StringTokenizer st = new StringTokenizer(sources_raw, ",");
+            while(st.hasMoreTokens()) {
+            String token = st.nextToken();
+            // We may have to replace old : with whatever namespace separator we are using.
+            token = token.replace(':', MSMUtils.NS_SEP);
+            sources.add(token);
+            }
+            for(int i = 0; i < Index.LEVEL.length; i++) {
+            if(level_str.equals(Index.LEVEL[i])) {
+                addIndex(new Index(i, sources, manager));
+            }
+            }
+        }
+        else {
+            return false;
+        }
+        }
+        return true;
+    }
+    else if(temp.startsWith("defaultindex")) {
+        CommandTokenizer ct = new CommandTokenizer(command);
+        ct.nextToken();
+        String entry = ct.nextToken();
+        if(entry.indexOf(":") != -1) {
+        String level_str = entry.substring(0, entry.indexOf(":"));
+        String sources_raw = entry.substring(entry.indexOf(":") + 1);
+        Vector sources = new Vector();
+        StringTokenizer st = new StringTokenizer(sources_raw, ",");
+        while(st.hasMoreTokens()) {
+            sources.add(st.nextToken());
+        }
+        for(int i = 0; i < Index.LEVEL.length; i++) {
+            if(level_str.equals(Index.LEVEL[i])) {
+            setDefault(new Index(i, sources, manager));
+            }
+        }
+        }
+        else {
+        return false;
+        }
+        return true;
+    }
+    return false;
+    }
+    public void removeAll() {
+    removeAllElements();
+    default_index = null;
+    gatherer.c_man.configurationChanged();
+    }
+    /** Method to remove a certain index.
       * @param index The <Strong>Index</strong> to remove.
       * @see org.greenstone.gatherer.Gatherer
 …
       * @see org.greenstone.gatherer.collection.CollectionManager
       */
      public void removeIndex(Index index) {
           if(index != null) {
                 String name = index.getName();
                 if(name != null) {
                      Language default_language = manager.languages.getDefaultLanguage();
                      CollectionMeta metadata = new CollectionMeta(manager, index, default_language, name);
                      manager.collectionmetadatum.removeMetadata(metadata);
+                }
                 removeElement(index);
                 if(default_index != null && default_index.equals(index)) {
                      default_index = null;
+                }
                 gatherer.c_man.configurationChanged();
+          }
+     }
      /** Method to set the default index.
+    public void removeIndex(Index index) {
+    if(index != null) {
+        String name = index.getName();
+        if(name != null) {
+        Language default_language = manager.languages.getDefaultLanguage();
+        CollectionMeta metadata = new CollectionMeta(manager, index, default_language, name);
+        manager.collectionmetadatum.removeMetadata(metadata);
+        }
+        removeElement(index);
+        if(default_index != null && default_index.equals(index)) {
+        default_index = null;
+        }
+        gatherer.c_man.configurationChanged();
+    }
+    }
+    /** Method to set the default index.
       * @param index The new default <strong>Index</strong>.
       * @see org.greenstone.gatherer.Gatherer
       * @see org.greenstone.gatherer.collection.CollectionManager
       */
      public void setDefault(Index index) {
           default_index = index;
           if(index != null && !contains(index)) {
                 addElement(index);
+          }
           gatherer.c_man.configurationChanged();
+     }
      /** Method to print out the contents of this class as a string.
+    public void setDefault(Index index) {
+    default_index = index;
+    if(index != null && !contains(index)) {
+        addElement(index);
+    }
+    gatherer.c_man.configurationChanged();
+    }
+    /** Method to print out the contents of this class as a string.
       * @return A <strong>String</strong> just as it would appear in the colleciton configuration file.
       */
      public String toString() {
           String text = "";
           // First the indexes.
           if(size() > 0) {
                 text = "indexes      ";
                 for(int i = 0; i < size(); i++) {
                      Index index = (Index) get(i);
                      text = text + index.toString(false);
                      if(i < size() - 1) {
                           text = text + " ";
+                     }
+                }
+    public String toString() {
+    String text = "";
+    // First the indexes.
+    if(size() > 0) {
+        text = "indexes      ";
+        for(int i = 0; i < size(); i++) {
+        Index index = (Index) get(i);
+        text = text + index.toString(false);
+        if(i < size() - 1) {
+            text = text + " ";
+        }
+        }
                 // Now the default index if there is one, or just the first index
                 // if there isn't
                 if(default_index != null) {
                      text = text + "\ndefaultindex " + default_index.toString(false) + "\n";
+                }
                 text = text + "\n";
+          }
           return text;
+     }
      /** Overloaded to call get with both a key and an empty argument array.
+        if(default_index != null) {
+        text = text + "\ndefaultindex " + default_index.toString(false) + "\n";
+        }
+        text = text + "\n";
+    }
+    return text;
+    }
+    /** Overloaded to call get with both a key and an empty argument array.
       * @param key A <strong>String</strong> which is mapped to a initial String within the ResourceBundle.
       * @return A <strong>String</strong> which has been referenced by the key String and that either contains no argument fields, or has had the argument fields automatiically populated with formatting Strings of with argument String provided in the get call.
       */
      private String get(String key) {
           return get(key, null);
+     }
      /** Used to retrieve a property value from the Locale specific ResourceBundle, based upon the key and arguments supplied. If the key cannot be found or if some other part of the call fails a default (English) error message is returned. <BR>
+    private String get(String key) {
+    return get(key, null);
+    }
+    /** Used to retrieve a property value from the Locale specific ResourceBundle, based upon the key and arguments supplied. If the key cannot be found or if some other part of the call fails a default (English) error message is returned. <BR>
       * Here the get recieves a second argument which is an array of Strings used to populate argument fields, denoted {<I>n</I>}, within the value String returned. Note that argument numbers greater than or equal to 32 are automatically mapped to the formatting String named Farg<I>n</I>.
       * @param key A <strong>String</strong> which is mapped to a initial String within the ResourceBundle.
 …
       * @see org.greenstone.gatherer.Dictionary
       */
      private String get(String key, String args[]) {
           if(key.indexOf('.') == -1) {
                 key = "CDM.IndexManager." + key;
+          }
           return gatherer.dictionary.get(key, args);
+     }
      /** This class creates a set of controls for editing the indexes. */
      private class Control
           extends JPanel {
             /** The default size of a label on this control. */
           private Dimension LABEL_SIZE = new Dimension(120,25);
           /** The button used to add a new index. */
           private JButton add = null;
           /** The button used to clear the default index. */
           private JButton clear_default = null;
           /** The button used to remove an index. */
           private JButton remove = null;
           /** The button used to set the default index. */
           private JButton set_default = null;
           /** The combobox used to adjust what level the new index will built on. */
           private JComboBox level = null;
           /** The label denoting the default index to be built for this collection. */
           private JLabel default_label = null;
           /** The label denoting the list of assigned indexes. */
           private JLabel index_label = null;
           /** The label denoting the control for choosing index level. */
           private JLabel level_label = null;
           /** The label denoting the name of the index. */
           private JLabel name_label = null;
           /** The label denoting the list of possible sources for the index. */
           private JLabel source_label = null;
           /** The title shown at the top of the index controls. */
           private JLabel title = null;
           /** The list of assigned indexes. */
           private JList index_list = null;
           /** The list of possible sources on which the index could be built. */
           private JList source_list = null;
           /** The panel used to display the list of assigned indexes. */
           private JPanel assigned_pane = null;
           /** The panel which contains the buttons used to edit indexes. */
           private JPanel button_pane = null;
           /** The panel on which all other panels are displayed. */
           private JPanel central_pane = null;
           /** The control pane showing the editable controls. */
           private JPanel control_pane = null;
           /** The edit pane contains the list of possible sources. */
           private JPanel edit_pane = null;
           /** A panel used to correctly lay out the default index label. */
           private JPanel default_pane = null;
           /** The panel containing the title label and instructions. */
           private JPanel header_pane = null;
           /** The lvel panel contains the control for adjusting index level. */
           private JPanel level_pane = null;
           /** The pane in which the name control is set. */
           private JPanel name_pane = null;
           /** The scrollpane containing the instructions text area. */
           private JScrollPane instructions_scroll = null;
           /** A text area containing inline instructions. */
           private JTextArea instructions = null;
           /** A text field naming the default index. Non-editable. */
           private JTextField default_value = null;
           /** A text field for controlling the name of the new index. */
           private JTextField name = null;
           /** A model containing all of the available index sources. */
           private Vector source_model = null;
           /** Constructor.
             * @see org.greenstone.gatherer.Configuration
             * @see org.greenstone.gatherer.Gatherer
             * @see org.greenstone.gatherer.cdm.IndexManager.Control.AddListener
             * @see org.greenstone.gatherer.cdm.IndexManager.Control.ClearDefaultListener
             * @see org.greenstone.gatherer.cdm.IndexManager.Control.NameListener
             * @see org.greenstone.gatherer.cdm.IndexManager.Control.RemoveListener
             * @see org.greenstone.gatherer.cdm.IndexManager.Control.SetDefaultListener
             * @see org.greenstone.gatherer.collection.CollectionManager
             * @see org.greenstone.gatherer.gui.Coloring
             * @see org.greenstone.gatherer.msm.MetadataSetManager
             * @see org.greenstone.gatherer.util.ExclusiveListSelectionListener
             */
           public Control() {
                 super();
                 source_model = new Vector();
                 source_model.add("text");
                 source_model.addAll(gatherer.c_man.msm.getAssignedElements());
+    private String get(String key, String args[]) {
+    if(key.indexOf('.') == -1) {
+        key = "CDM.IndexManager." + key;
+    }
+    return gatherer.dictionary.get(key, args);
+    }
+    /** This class creates a set of controls for editing the indexes. */
+    private class Control
+    extends JPanel {
+    /** The default size of a label on this control. */
+    private Dimension LABEL_SIZE = new Dimension(120,25);
+    /** The button used to add a new index. */
+    private JButton add = null;
+    /** The button used to clear the default index. */
+    private JButton clear_default = null;
+    /** The button used to remove an index. */
+    private JButton remove = null;
+    /** The button used to set the default index. */
+    private JButton set_default = null;
+    /** The combobox used to adjust what level the new index will built on. */
+    private JComboBox level = null;
+    /** The label denoting the default index to be built for this collection. */
+    private JLabel default_label = null;
+    /** The label denoting the list of assigned indexes. */
+    private JLabel index_label = null;
+    /** The label denoting the control for choosing index level. */
+    private JLabel level_label = null;
+    /** The label denoting the name of the index. */
+    private JLabel name_label = null;
+    /** The label denoting the list of possible sources for the index. */
+    private JLabel source_label = null;
+    /** The title shown at the top of the index controls. */
+    private JLabel title = null;
+    /** The list of assigned indexes. */
+    private JList index_list = null;
+    /** The list of possible sources on which the index could be built. */
+    private JList source_list = null;
+    /** The panel used to display the list of assigned indexes. */
+    private JPanel assigned_pane = null;
+    /** The panel which contains the buttons used to edit indexes. */
+    private JPanel button_pane = null;
+    /** The panel on which all other panels are displayed. */
+    private JPanel central_pane = null;
+    /** The control pane showing the editable controls. */
+    private JPanel control_pane = null;
+    /** The edit pane contains the list of possible sources. */
+    private JPanel edit_pane = null;
+    /** A panel used to correctly lay out the default index label. */
+    private JPanel default_pane = null;
+    /** The panel containing the title label and instructions. */
+    private JPanel header_pane = null;
+    /** The lvel panel contains the control for adjusting index level. */
+    private JPanel level_pane = null;
+    /** The pane in which the name control is set. */
+    private JPanel name_pane = null;
+    /** The scrollpane containing the instructions text area. */
+    private JScrollPane instructions_scroll = null;
+    /** A text area containing inline instructions. */
+    private JTextArea instructions = null;
+    /** A text field naming the default index. Non-editable. */
+    private JTextField default_value = null;
+    /** A text field for controlling the name of the new index. */
+    private JTextField name = null;
+    /** A model containing all of the available index sources. */
+    private Vector source_model = null;
+    /** Constructor.
+     * @see org.greenstone.gatherer.Configuration
+     * @see org.greenstone.gatherer.Gatherer
+     * @see org.greenstone.gatherer.cdm.IndexManager.Control.AddListener
+     * @see org.greenstone.gatherer.cdm.IndexManager.Control.ClearDefaultListener
+     * @see org.greenstone.gatherer.cdm.IndexManager.Control.NameListener
+     * @see org.greenstone.gatherer.cdm.IndexManager.Control.RemoveListener
+     * @see org.greenstone.gatherer.cdm.IndexManager.Control.SetDefaultListener
+     * @see org.greenstone.gatherer.collection.CollectionManager
+     * @see org.greenstone.gatherer.gui.Coloring
+     * @see org.greenstone.gatherer.msm.MetadataSetManager
+     * @see org.greenstone.gatherer.util.ExclusiveListSelectionListener
+     */
+    public Control() {
+        super();
+        source_model = new Vector();
+        source_model.add("text");
+        source_model.addAll(gatherer.c_man.msm.getAssignedElements());
                 //source_model.addAll(gatherer.c_man.msm.getElements());
                 // Creation
                 add = new JButton(get("Add"));
                 add.setEnabled(false);
                 add.setMnemonic(KeyEvent.VK_A);
                 assigned_pane = new JPanel();
                 button_pane = new JPanel();
                 central_pane = new JPanel();
                 control_pane = new JPanel();
                 clear_default = new JButton(get("Clear_Default"));
                 clear_default.setMnemonic(KeyEvent.VK_C);
                 if(default_index == null) {
                      clear_default.setEnabled(false);
+                }
                 default_label = new JLabel(get("Default_Index"));
                 default_pane = new JPanel();
                 if(default_index != null) {
                      default_value = new JTextField(default_index.toString(true));
                      default_value.setCaretPosition(0);
+                }
                 else {
                      default_value = new JTextField();
+                }
                 edit_pane = new JPanel();
                 header_pane = new JPanel();
                 index_label = new JLabel(get("Indexes"));
                 index_list = new JList(model);
                 instructions = new JTextArea(get("Instructions"));
                 instructions.setBackground(Gatherer.config.getColor("coloring.collection_tree_background", false));
                 instructions.setEditable(false);
                 instructions.setLineWrap(true);
                 instructions.setRows(5);
                 instructions.setWrapStyleWord(true);
                 level = new JComboBox();
                 level.addItem(get("Document"));
                 level.addItem(get("Paragraph"));
                 level.addItem(get("Section"));
                 level.setEditable(false);
                 level_label = new JLabel(get("Level"));
                 level_label.setPreferredSize(LABEL_SIZE);
                 level_pane = new JPanel();
                 name = new JTextField();
                 name_label = new JLabel(get("Name"));
                 name_label.setPreferredSize(LABEL_SIZE);
                 name_pane = new JPanel();
                 remove = new JButton(get("Remove"));
                 remove.setEnabled(false);
                 remove.setMnemonic(KeyEvent.VK_R);
                 set_default = new JButton(get("Set_Default"));
                 set_default.setEnabled(false);
                 set_default.setMnemonic(KeyEvent.VK_S);
                 source_label = new JLabel(get("Source"));
                 source_list = new JList(source_model);
                 title = new JLabel(get("Title"));
                 title.setHorizontalAlignment(JLabel.CENTER);
+        add = new JButton(get("Add"));
+        add.setEnabled(false);
+        add.setMnemonic(KeyEvent.VK_A);
+        assigned_pane = new JPanel();
+        button_pane = new JPanel();
+        central_pane = new JPanel();
+        control_pane = new JPanel();
+        clear_default = new JButton(get("Clear_Default"));
+        clear_default.setMnemonic(KeyEvent.VK_C);
+        if(default_index == null) {
+        clear_default.setEnabled(false);
+        }
+        default_label = new JLabel(get("Default_Index"));
+        default_pane = new JPanel();
+        if(default_index != null) {
+        default_value = new JTextField(default_index.toString(true));
+        default_value.setCaretPosition(0);
+        }
+        else {
+        default_value = new JTextField();
+        }
+        edit_pane = new JPanel();
+        header_pane = new JPanel();
+        index_label = new JLabel(get("Indexes"));
+        index_list = new JList(model);
+        instructions = new JTextArea(get("Instructions"));
+        instructions.setBackground(Gatherer.config.getColor("coloring.collection_tree_background", false));
+        instructions.setEditable(false);
+        instructions.setLineWrap(true);
+        instructions.setRows(5);
+        instructions.setWrapStyleWord(true);
+        level = new JComboBox();
+        level.addItem(get("Document"));
+        level.addItem(get("Paragraph"));
+        level.addItem(get("Section"));
+        level.setEditable(false);
+        level_label = new JLabel(get("Level"));
+        level_label.setPreferredSize(LABEL_SIZE);
+        level_pane = new JPanel();
+        name = new JTextField();
+        name_label = new JLabel(get("Name"));
+        name_label.setPreferredSize(LABEL_SIZE);
+        name_pane = new JPanel();
+        remove = new JButton(get("Remove"));
+        remove.setEnabled(false);
+        remove.setMnemonic(KeyEvent.VK_R);
+        set_default = new JButton(get("Set_Default"));
+        set_default.setEnabled(false);
+        set_default.setMnemonic(KeyEvent.VK_S);
+        source_label = new JLabel(get("Source"));
+        source_list = new JList(source_model);
+        title = new JLabel(get("Title"));
+        title.setHorizontalAlignment(JLabel.CENTER);
                 // Listeners
                 add.addActionListener(new AddListener());
                 clear_default.addActionListener(new ClearDefaultListener());
                 remove.addActionListener(new RemoveListener());
                 set_default.addActionListener(new SetDefaultListener());
                 name.addKeyListener(new NameListener());
                 ListListener ll = new ListListener();
                 index_list.addListSelectionListener(ll);
                 source_list.addListSelectionListener(ll);
                 ExclusiveListSelectionListener elsl = new ExclusiveListSelectionListener();
                 elsl.add(index_list);
                 elsl.add(source_list);
+        add.addActionListener(new AddListener());
+        clear_default.addActionListener(new ClearDefaultListener());
+        remove.addActionListener(new RemoveListener());
+        set_default.addActionListener(new SetDefaultListener());
+        name.addKeyListener(new NameListener());
+        ListListener ll = new ListListener();
+        index_list.addListSelectionListener(ll);
+        source_list.addListSelectionListener(ll);
+        ExclusiveListSelectionListener elsl = new ExclusiveListSelectionListener();
+        elsl.add(index_list);
+        elsl.add(source_list);
                 // Layout
                 title.setBorder(BorderFactory.createEmptyBorder(0,0,2,0));
                 instructions.setBorder(BorderFactory.createEmptyBorder(2,5,2,5));
                 header_pane.setLayout(new BorderLayout());
                 header_pane.add(title, BorderLayout.NORTH);
                 header_pane.add(new JScrollPane(instructions), BorderLayout.CENTER);
                 name_label.setBorder(BorderFactory.createEmptyBorder(0,0,0,5));
                 name_pane.setBorder(BorderFactory.createEmptyBorder(4,2,4,2));
                 name_pane.setLayout(new BorderLayout());
                 name_pane.add(name_label, BorderLayout.WEST);
                 name_pane.add(name, BorderLayout.CENTER);
                 control_pane.setLayout(new BorderLayout());
                 control_pane.add(source_label, BorderLayout.NORTH);
                 control_pane.add(new JScrollPane(source_list), BorderLayout.CENTER);
                 level_label.setBorder(BorderFactory.createEmptyBorder(0,0,0,5));
                 level_pane.setBorder(BorderFactory.createEmptyBorder(4,2,4,2));
                 level_pane.setLayout(new BorderLayout());
                 level_pane.add(level_label, BorderLayout.WEST);
                 level_pane.add(level, BorderLayout.CENTER);
                 edit_pane.setBorder(BorderFactory.createEmptyBorder(0,0,0,5));
                 edit_pane.setLayout(new BorderLayout());
                 edit_pane.add(name_pane, BorderLayout.NORTH);
                 edit_pane.add(control_pane, BorderLayout.CENTER);
                 edit_pane.add(level_pane, BorderLayout.SOUTH);
                 default_label.setBorder(BorderFactory.createEmptyBorder(0,0,0,5));
                 default_pane.setBorder
                      (BorderFactory.createCompoundBorder
                       (BorderFactory.createCompoundBorder
                         (BorderFactory.createEmptyBorder(2,2,2,2),
                          BorderFactory.createRaisedBevelBorder()),
                         BorderFactory.createEmptyBorder(2,2,2,2)));
                 default_pane.setLayout(new BorderLayout());
                 default_pane.add(default_label, BorderLayout.WEST);
                 default_pane.add(default_value, BorderLayout.CENTER);
                 assigned_pane.setLayout(new BorderLayout());
                 assigned_pane.add(index_label, BorderLayout.NORTH);
                 assigned_pane.add(new JScrollPane(index_list), BorderLayout.CENTER);
                 assigned_pane.add(default_pane, BorderLayout.SOUTH);
                 central_pane.setBorder(BorderFactory.createEmptyBorder(2,0,2,0));
                 central_pane.setLayout(new GridLayout(1,2));
                 central_pane.add(edit_pane);
                 central_pane.add(assigned_pane);
                 button_pane.setLayout(new GridLayout(2,2));
                 button_pane.add(add);
                 button_pane.add(remove);
                 button_pane.add(clear_default);
                 button_pane.add(set_default);
                 setBorder(BorderFactory.createEmptyBorder(5,5,5,5));
                 setLayout(new BorderLayout());
                 add(header_pane, BorderLayout.NORTH);
                 add(central_pane, BorderLayout.CENTER);
                 add(button_pane, BorderLayout.SOUTH);
+          }
           /* Destructor, removes persistant listeners from the Dictionary.
+        title.setBorder(BorderFactory.createEmptyBorder(0,0,2,0));
+        instructions.setBorder(BorderFactory.createEmptyBorder(2,5,2,5));
+        header_pane.setLayout(new BorderLayout());
+        header_pane.add(title, BorderLayout.NORTH);
+        header_pane.add(new JScrollPane(instructions), BorderLayout.CENTER);
+        name_label.setBorder(BorderFactory.createEmptyBorder(0,0,0,5));
+        name_pane.setBorder(BorderFactory.createEmptyBorder(4,2,4,2));
+        name_pane.setLayout(new BorderLayout());
+        name_pane.add(name_label, BorderLayout.WEST);
+        name_pane.add(name, BorderLayout.CENTER);
+        control_pane.setLayout(new BorderLayout());
+        control_pane.add(source_label, BorderLayout.NORTH);
+        control_pane.add(new JScrollPane(source_list), BorderLayout.CENTER);
+        level_label.setBorder(BorderFactory.createEmptyBorder(0,0,0,5));
+        level_pane.setBorder(BorderFactory.createEmptyBorder(4,2,4,2));
+        level_pane.setLayout(new BorderLayout());
+        level_pane.add(level_label, BorderLayout.WEST);
+        level_pane.add(level, BorderLayout.CENTER);
+        edit_pane.setBorder(BorderFactory.createEmptyBorder(0,0,0,5));
+        edit_pane.setLayout(new BorderLayout());
+        edit_pane.add(name_pane, BorderLayout.NORTH);
+        edit_pane.add(control_pane, BorderLayout.CENTER);
+        edit_pane.add(level_pane, BorderLayout.SOUTH);
+        default_label.setBorder(BorderFactory.createEmptyBorder(0,0,0,5));
+        default_pane.setBorder
+        (BorderFactory.createCompoundBorder
+         (BorderFactory.createCompoundBorder
+          (BorderFactory.createEmptyBorder(2,2,2,2),
+           BorderFactory.createRaisedBevelBorder()),
+          BorderFactory.createEmptyBorder(2,2,2,2)));
+        default_pane.setLayout(new BorderLayout());
+        default_pane.add(default_label, BorderLayout.WEST);
+        default_pane.add(default_value, BorderLayout.CENTER);
+        assigned_pane.setLayout(new BorderLayout());
+        assigned_pane.add(index_label, BorderLayout.NORTH);
+        assigned_pane.add(new JScrollPane(index_list), BorderLayout.CENTER);
+        assigned_pane.add(default_pane, BorderLayout.SOUTH);
+        central_pane.setBorder(BorderFactory.createEmptyBorder(2,0,2,0));
+        central_pane.setLayout(new GridLayout(1,2));
+        central_pane.add(edit_pane);
+        central_pane.add(assigned_pane);
+        button_pane.setLayout(new GridLayout(2,2));
+        button_pane.add(add);
+        button_pane.add(remove);
+        button_pane.add(clear_default);
+        button_pane.add(set_default);
+        setBorder(BorderFactory.createEmptyBorder(5,5,5,5));
+        setLayout(new BorderLayout());
+        add(header_pane, BorderLayout.NORTH);
+        add(central_pane, BorderLayout.CENTER);
+        add(button_pane, BorderLayout.SOUTH);
+    }
+    /* Destructor, removes persistant listeners from the Dictionary.
             */
           public void destroy() {
+          }
           /** We override the updateUI method so that we can ensure we are scrolled to the top of the instructions box first.
+    public void destroy() {
+    }
+    /** We override the updateUI method so that we can ensure we are scrolled to the top of the instructions box first.
           * @see org.greenstone.gatherer.Gatherer
           * @see org.greenstone.gatherer.collection.CollectionManager
           * @see org.greenstone.gatherer.msm.MetadataSetManager
             */
           public void updateUI() {
                 if(instructions != null) {
                      instructions.setCaretPosition(0);
+                }
+    public void updateUI() {
+        if(instructions != null) {
+        instructions.setCaretPosition(0);
+        }
                 // Reload the assigned indexes list.
                 if(source_model != null) {
                      source_model.clear();
                      source_model.add("text");
                      source_model.addAll(gatherer.c_man.msm.getAssignedElements());
+                }
+        if(source_model != null) {
+        source_model.clear();
+        source_model.add("text");
+        source_model.addAll(gatherer.c_man.msm.getAssignedElements());
+        }
                 // Faster than a NPE its the - 'Super class'.
                 super.updateUI();
+          }
           /** Listens for actions apon the 'add' button in the IndexManager controls, and if detected calls the add method of the manager with a newly created index. */
           private class AddListener
                 implements ActionListener {
+        super.updateUI();
+    }
+    /** Listens for actions apon the 'add' button in the IndexManager controls, and if detected calls the add method of the manager with a newly created index. */
+    private class AddListener
+        implements ActionListener {
                 /** Method called when an action is performed on a registered component, and when it does we check if we have enough data to create a new index, and if so we create one.
+                * @param event An <strong>ActionEvent</strong> providing extra information about the event.
+                * @see org.greenstone.gatherer.cdm.CollectionDesignManager
+                * @see org.greenstone.gatherer.cdm.CollectionMeta
+                * @see org.greenstone.gatherer.cdm.CollectionMetaManager
+                * @see org.greenstone.gatherer.cdm.Index
+                * @see org.greenstone.gatherer.cdm.Language
+                * @see org.greenstone.gatherer.cdm.LanguageManager
+                 * @param event An <strong>ActionEvent</strong> providing extra information about the event.
+                 * @see org.greenstone.gatherer.cdm.CollectionDesignManager
+                 * @see org.greenstone.gatherer.cdm.CollectionMeta
+                 * @see org.greenstone.gatherer.cdm.CollectionMetaManager
+                 * @see org.greenstone.gatherer.cdm.Index
+                 * @see org.greenstone.gatherer.cdm.Language
+                 * @see org.greenstone.gatherer.cdm.LanguageManager
+                 */
+        public void actionPerformed(ActionEvent event) {
+        if(!source_list.isSelectionEmpty() && name.getText().length() != 0) {
+            Object object[] = source_list.getSelectedValues();
+            Vector sources = new Vector();
+            for(int i = 0; i < object.length; i++) {
+            sources.add(object[i]);
+            }
+            Index index = new Index(level.getSelectedIndex(), sources, manager);
+            // Before we add the index to the model, we have to add the collection metadata for this.
+            Language language = manager.languages.getDefaultLanguage();
+            CollectionMeta metadata = new CollectionMeta(manager, index, language, name.getText());
+            manager.collectionmetadatum.addMetadata(metadata);
+            // Finally add index.
+            addIndex(index);
+        }
+        }
+    }
+    /** Listens for actions apon the 'clear default' button in the IndexManager controls, and if detected calls the setDefault method of the manager with <i>null</i>. */
+    private class ClearDefaultListener
+        implements ActionListener {
+                /** If called when an action occurs on a registered component, we clear the default index.
+                 * @param event An <strong>ActionEvent</strong> containing extra information about the action that occured.
                 */
+                public void actionPerformed(ActionEvent event) {
+                     if(!source_list.isSelectionEmpty() && name.getText().length() != 0) {
+                          Object object[] = source_list.getSelectedValues();
+                          Vector sources = new Vector();
+                          for(int i = 0; i < object.length; i++) {
+                                sources.add(object[i]);
+                          }
+                          Index index = new Index(level.getSelectedIndex(), sources, manager);
+                          // Before we add the index to the model, we have to add the collection metadata for this.
+                          Language language = manager.languages.getDefaultLanguage();
+                          CollectionMeta metadata = new CollectionMeta(manager, index, language, name.getText());
+                          manager.collectionmetadatum.addMetadata(metadata);
+                          // Finally add index.
+                          addIndex(index);
+                     }
+                }
+          }
+          /** Listens for actions apon the 'clear default' button in the IndexManager controls, and if detected calls the setDefault method of the manager with <i>null</i>. */
+          private class ClearDefaultListener
+                implements ActionListener {
+                /** If called when an action occurs on a registered component, we clear the default index.
+                * @param event An <strong>ActionEvent</strong> containing extra information about the action that occured.
+        public void actionPerformed(ActionEvent event) {
+        setDefault(null);
+        clear_default.setEnabled(false);
+        default_value.setText("");
+        }
+    }
+    /** Listens for actions apon the 'remove' button in the IndexManager controls, and if detected calls the remove method of the manager with the index selected for removal. */
+    private class RemoveListener
+        implements ActionListener {
+                /** If called when an action occurs on a registered component, we remove the currently selected index, if there is one.
+                 * @param event An <strong>ActionEvent</strong> containing extra information about the action that occured.
+                 * @see org.greenstone.gatherer.cdm.Index
+                 */
+        public void actionPerformed(ActionEvent event) {
+        if(!index_list.isSelectionEmpty()) {
+            removeIndex((Index)index_list.getSelectedValue());
+            if(default_index == null) {
+            clear_default.setEnabled(false);
+            default_value.setText("");
+            }
+        }
+        }
+    }
+    /** Listens for actions apon the 'set default' button in the IndexManager controls, and if detected calls the setDefault method of the manager with the index selected for default. */
+    private class SetDefaultListener
+        implements ActionListener {
+                /** If called when an action occurs on a registered component, we set the default index to the index currently selected.
+                 * @param event An <strong>ActionEvent</strong> containing extra information about the action that occured.
+                 * @see org.greenstone.gatherer.cdm.Index
+                 */
+        public void actionPerformed(ActionEvent event) {
+        setDefault((Index)index_list.getSelectedValue());
+        if(default_index != null) {
+            clear_default.setEnabled(true);
+            default_value.setText(default_index.toString(true));
+            default_value.setCaretPosition(0);
+        }
+        else {
+            clear_default.setEnabled(false);
+            default_value.setText("");
+        }
+        }
+    }
+    /** Listens for key presses within the name field, and enabled or disables controls as appropriate. */
+    private class NameListener
+        extends KeyAdapter {
+                /** Called when a key is released, this is the perfect time to enable the add button if the fields are appropriately set.
+                 * @param event A <strong>KeyEvent</strong> containing information about the key released.
                 */
+                public void actionPerformed(ActionEvent event) {
+                     setDefault(null);
+                     clear_default.setEnabled(false);
+                     default_value.setText("");
+                }
+          }
+          /** Listens for actions apon the 'remove' button in the IndexManager controls, and if detected calls the remove method of the manager with the index selected for removal. */
+          private class RemoveListener
+                implements ActionListener {
+                /** If called when an action occurs on a registered component, we remove the currently selected index, if there is one.
+                * @param event An <strong>ActionEvent</strong> containing extra information about the action that occured.
+                * @see org.greenstone.gatherer.cdm.Index
+        public void keyReleased(KeyEvent event) {
+        if(source_list.isSelectionEmpty() || name.getText().length() == 0) {
+            add.setEnabled(false);
+        }
+        else {
+            add.setEnabled(true);
+        }
+        if(index_list.isSelectionEmpty()) {
+            remove.setEnabled(false);
+            set_default.setEnabled(false);
+        }
+        else {
+            remove.setEnabled(true);
+            set_default.setEnabled(true);
+        }
+        }
+    }
+    /** Listens for selections within the list on the IndexManager controls, and if a change is detected enables, or disables, controls appropriately. */
+    private class ListListener
+        implements ListSelectionListener {
+                /** This method is called whenever the source list selection changes. When it does we need to check if the add button should now be enabled.
+                 * @param event A <strong>ListSelectionEvent</strong> containing further information about the list selection.
                 */
+                public void actionPerformed(ActionEvent event) {
+                     if(!index_list.isSelectionEmpty()) {
+                          removeIndex((Index)index_list.getSelectedValue());
+                          if(default_index == null) {
+                                clear_default.setEnabled(false);
+                                default_value.setText("");
+                          }
+                     }
+                }
+          }
+          /** Listens for actions apon the 'set default' button in the IndexManager controls, and if detected calls the setDefault method of the manager with the index selected for default. */
+          private class SetDefaultListener
+                implements ActionListener {
+                /** If called when an action occurs on a registered component, we set the default index to the index currently selected.
+                * @param event An <strong>ActionEvent</strong> containing extra information about the action that occured.
+                * @see org.greenstone.gatherer.cdm.Index
+                */
+                public void actionPerformed(ActionEvent event) {
+                     setDefault((Index)index_list.getSelectedValue());
+                     if(default_index != null) {
+                          clear_default.setEnabled(true);
+                          default_value.setText(default_index.toString(true));
+                          default_value.setCaretPosition(0);
+                     }
+                     else {
+                          clear_default.setEnabled(false);
+                          default_value.setText("");
+                     }
+                }
+          }
+          /** Listens for key presses within the name field, and enabled or disables controls as appropriate. */
+          private class NameListener
+                extends KeyAdapter {
+                /** Called when a key is released, this is the perfect time to enable the add button if the fields are appropriately set.
+                * @param event A <strong>KeyEvent</strong> containing information about the key released.
+                */
+                public void keyReleased(KeyEvent event) {
+                     if(source_list.isSelectionEmpty() || name.getText().length() == 0) {
+                          add.setEnabled(false);
+                     }
+                     else {
+                          add.setEnabled(true);
+                     }
+                     if(index_list.isSelectionEmpty()) {
+                          remove.setEnabled(false);
+                          set_default.setEnabled(false);
+                     }
+                     else {
+                          remove.setEnabled(true);
+                          set_default.setEnabled(true);
+                     }
+                }
+          }
+          /** Listens for selections within the list on the IndexManager controls, and if a change is detected enables, or disables, controls appropriately. */
+          private class ListListener
+                implements ListSelectionListener {
+                /** This method is called whenever the source list selection changes. When it does we need to check if the add button should now be enabled.
+                * @param event A <strong>ListSelectionEvent</strong> containing further information about the list selection.
+                */
+                public void valueChanged(ListSelectionEvent event) {
+                     if(source_list.isSelectionEmpty() || name.getText().length() == 0) {
+                          add.setEnabled(false);
+                     }
+                     else {
+                          add.setEnabled(true);
+                     }
+                     if(index_list.isSelectionEmpty()) {
+                          remove.setEnabled(false);
+                          set_default.setEnabled(false);
+                     }
+                     else {
+                          remove.setEnabled(true);
+                          set_default.setEnabled(true);
+                     }
+                }
+          }
+     }
+        public void valueChanged(ListSelectionEvent event) {
+        if(source_list.isSelectionEmpty() || name.getText().length() == 0) {
+            add.setEnabled(false);
+        }
+        else {
+            add.setEnabled(true);
+        }
+        if(index_list.isSelectionEmpty()) {
+            remove.setEnabled(false);
+            set_default.setEnabled(false);
+        }
+        else {
+            remove.setEnabled(true);
+            set_default.setEnabled(true);
+        }
+        }
+    }
+    }
+}

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

-              r4293
+              r4366
 */
 public class Language
      implements Comparable {
      /** Is this language the default one. */
      private boolean default_language = false;
      /** The name of this language. */
      private String name = null;
      /** The two character code for this language. */
      private String value = null;
      /** Constructor.
       * @param value A <strong>String</strong> representing the code for this language.
       * @param name A <strong>String</strong> representing the name of this language.
       * @param default_language A <i>boolean</i> which is <i>true</i> if this language is the default one.
+    implements Comparable {
+    /** Is this language the default one. */
+    private boolean default_language = false;
+    /** The name of this language. */
+    private String name = null;
+    /** The two character code for this language. */
+    private String value = null;
+    /** Constructor.
+     * @param value A <strong>String</strong> representing the code for this language.
+     * @param name A <strong>String</strong> representing the name of this language.
+     * @param default_language A <i>boolean</i> which is <i>true</i> if this language is the default one.
       */
      public Language(String value, String name, boolean default_language) {
           this.default_language = default_language;
           this.name = name;
           this.value = value.substring(0, 2);
+     }
      /** Copy constructor.
+    public Language(String value, String name, boolean default_language) {
+    this.default_language = default_language;
+    this.name = name;
+    this.value = value.substring(0, 2);
+    }
+    /** Copy constructor.
       * @param language The <strong>Language</strong> we want to copy.
       */
      public Language(Language language) {
           this.default_language = language.isDefault();
           this.name = language.toString();
           this.value = language.getCode();
+     }
      /** Method to compare two languages for ordering purposes.
+    public Language(Language language) {
+    this.default_language = language.isDefault();
+    this.name = language.toString();
+    this.value = language.getCode();
+    }
+    /** Method to compare two languages for ordering purposes.
       * @param object The other language as an <strong>Object</strong>.
       * @return An <i>int</i> which indicates order using the same values as in String.compareTo().
       * @see java.lang.String#compareTo
       */
      public int compareTo(Object object) {
           return toString().compareTo(object.toString());
+     }
      /** Method to test for the equality of two languages.
+    public int compareTo(Object object) {
+    return toString().compareTo(object.toString());
+    }
+    /** Method to test for the equality of two languages.
       * @param object The other language as an <strong>Object</strong>.
       * @return <i>true</i> if the languages are equal, <i>false</i> otherwise.
       */
      public boolean equals(Object object) {
           if(compareTo(object) == 0) {
                 return true;
+          }
           return false;
+     }
      /** Method to retrieve the code of this language.
+    public boolean equals(Object object) {
+    if(compareTo(object) == 0) {
+        return true;
+    }
+    return false;
+    }
+    /** Method to retrieve the code of this language.
       * @return A <strong>String</strong> representing the two letter code.
       */
      public String getCode() {
           return value;
+     }
      /** Method to determine if this language is the default one.
+    public String getCode() {
+    return value;
+    }
+    /** Method to determine if this language is the default one.
       * @return A <i>boolean</i> which is <i>true</i> if this language is the default one.
       */
      public boolean isDefault() {
           return default_language;
+     }
      /** Method to set the value of default.
+    public boolean isDefault() {
+    return default_language;
+    }
+    /** Method to set the value of default.
       * @param value The new value of default as a <i>boolean</i>.
       */
      public void setDefault(boolean value) {
           this.default_language = default_language;
+     }
      /** Method to display the language code.
+    public void setDefault(boolean value) {
+    this.default_language = default_language;
+    }
+    /** Method to display the language code.
       * @return A <strong>String</strong> representing the language code.
       */
      public String toString() {
           return name;
+     }
+    public String toString() {
+    return name;
+    }
+}

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

-              r4293
+              r4366
 import org.greenstone.gatherer.cdm.Language;
 /** This class manages the language commands, remembering both a list of languages to build indexes in, plus the default language.
 * @author John Thompson, Greenstone Digital Library, University of Waikato
 * @version 2.3
 */
+ * @author John Thompson, Greenstone Digital Library, University of Waikato
+ * @version 2.3
+ */
 public class LanguageManager
      extends DefaultListModel {
     /** A reference to the collection design manager. */
      private CollectionDesignManager manager = null;
      /** The visual controls for this manager. */
      private Control controls = null;
      /** A reference to the Gatherer. */
      private Gatherer gatherer = null;
      /** A reference to this class as a model, for the inner controls class. */
      private ListModel model = null;
      /** A hashtable of code->name mappings of known languages. */
      private LinkedHashMap known_languages = null;
      /** The default language object. */
      private Language default_language = null;
      /** Constructor.
       * @param gatherer A reference to the <strong>Gatherer</strong>.
       * @param manager A reference to the <strong>CollectionDesignManager</strong>.
       */
      public LanguageManager(Gatherer gatherer, CollectionDesignManager manager) {
           super();
           this.gatherer = gatherer;
           this.known_languages = new LinkedHashMap();
           this.manager = manager;
           this.model = this;
           loadLanguages();
+     }
      /** Method to add a new language.
+    extends DefaultListModel {
+    /** A reference to the collection design manager. */
+    private CollectionDesignManager manager = null;
+    /** The visual controls for this manager. */
+    private Control controls = null;
+    /** A reference to the Gatherer. */
+    private Gatherer gatherer = null;
+    /** A reference to this class as a model, for the inner controls class. */
+    private ListModel model = null;
+    /** A hashtable of code->name mappings of known languages. */
+    private LinkedHashMap known_languages = null;
+    /** The default language object. */
+    private Language default_language = null;
+    /** Constructor.
+     * @param gatherer A reference to the <strong>Gatherer</strong>.
+     * @param manager A reference to the <strong>CollectionDesignManager</strong>.
+     */
+    public LanguageManager(Gatherer gatherer, CollectionDesignManager manager) {
+    super();
+    this.gatherer = gatherer;
+    this.known_languages = new LinkedHashMap();
+    this.manager = manager;
+    this.model = this;
+    loadLanguages();
+    }
+    /** Method to add a new language.
       * @param language The <strong>Language</strong> to add.
       * @see org.greenstone.gatherer.Gatherer
       * @see org.greenstone.gatherer.collection.CollectionManager
       */
      public void addLanguage(Language language) {
           if(!contains(language)) {
+    public void addLanguage(Language language) {
+    if(!contains(language)) {
                 // Add alphabetically.
                 for(int index = 0; index < size(); index++) {
                      Language sibling = (Language) get(index);
                      int position = language.compareTo(sibling);
                      // Sibling is before language.
                      if(position > 0) {
                           // Carry on.
+                     }
                      // Language is equal to, or before sibling. Insert it.
                      else if(position == 0 || position < 0) {
                           add(index, language);
                           gatherer.c_man.configurationChanged();
                           return;
+                     }
+                }
+        for(int index = 0; index < size(); index++) {
+        Language sibling = (Language) get(index);
+        int position = language.compareTo(sibling);
+        // Sibling is before language.
+        if(position > 0) {
+            // Carry on.
+        }
+        // Language is equal to, or before sibling. Insert it.
+        else if(position == 0 || position < 0) {
+            add(index, language);
+            gatherer.c_man.configurationChanged();
+            return;
+        }
+        }
                 // If we got this far, we haven't inserted language, and we are out of model so.
                 addElement(language);
                 gatherer.c_man.configurationChanged();
+          }
+     }
      /** Method to retrieve the control for this manager.
+        addElement(language);
+        gatherer.c_man.configurationChanged();
+    }
+    }
+    /** Method to retrieve the control for this manager.
       * @return A <strong>JPanel</strong> containing the controls.
       */
      public JPanel getControls() {
           if(controls == null) {
                 controls = new Control();
+          }
           return controls;
+     }
      /** Method to retrieve the default language code.
+    public JPanel getControls() {
+    if(controls == null) {
+        controls = new Control();
+    }
+    return controls;
+    }
+    /** Method to retrieve the default language code.
       * @return A <strong>Language</strong> containing a two letter code.
       */
      public Language getDefaultLanguage() {
           // If no default is set...
           if(default_language == null) {
+    public Language getDefaultLanguage() {
+    // If no default is set...
+    if(default_language == null) {
                 // And we have other assigned languages, use the first one of them.
                 if(size() >= 1) {
                      default_language = (Language) get(0);
+                }
+        if(size() >= 1) {
+        default_language = (Language) get(0);
+        }
                 // And we have nothing else, use English.
                 else {
                      default_language = getLanguage("en", false);
                      // Remember to add it.
                      addLanguage(default_language);
+                }
+          }
           return default_language;
+     }
      /** Method to retrieve a certain language object by its code.
+        else {
+        default_language = getLanguage("en", false);
+        // Remember to add it.
+        addLanguage(default_language);
+        }
+    }
+    return default_language;
+    }
+    /** Method to retrieve a certain language object by its code.
       * @param code The two letter code of a language, as a <strong>String</strong>.
       * @param assigned_only If <i>true</i> only those languages currently having indexes built for them are checked, otherwise the known languages buffer is checked.
       * @return The <strong>Language</strong> that matches the given code, or <i>null</i> if no such language exists.
       */
      public Language getLanguage(String code, boolean assigned_only) {
           if(assigned_only) {
                 for(int i = 0; i < size(); i++) {
                      Language pos = (Language)get(i);
                      ///ystem.err.println("Comparing " + pos.getCode() + " and " + code);
                      if(pos.getCode().equals(code)) {
                           return pos;
+                     }
+                }
+          }
           else {
                 if(known_languages.containsKey(code)) {
                      return new Language((Language)known_languages.get(code));
+                }
+          }
           return null;
+     }
      /** Method to return a list of the known language codes.
+    public Language getLanguage(String code, boolean assigned_only) {
+    if(assigned_only) {
+        for(int i = 0; i < size(); i++) {
+        Language pos = (Language)get(i);
+        ///ystem.err.println("Comparing " + pos.getCode() + " and " + code);
+        if(pos.getCode().equals(code)) {
+            return pos;
+        }
+        }
+    }
+    else {
+        if(known_languages.containsKey(code)) {
+        return new Language((Language)known_languages.get(code));
+        }
+    }
+    return null;
+    }
+    /** Method to return a list of the known language codes.
       * @return An <strong>ArrayList</strong> containing a series of alphabetically sorted two letter codes.
       */
      public ArrayList getLanguageCodes() {
           ArrayList result = new ArrayList();
           Iterator key_iter = known_languages.keySet().iterator();
           while(key_iter.hasNext()) {
                 result.add(known_languages.get(key_iter.next()));
+          }
           //for(Enumeration keys = known_languages.keys(); keys.hasMoreElements(); ) {
           //    result.add(known_languages.get(keys.nextElement()));
           //}
           //Collections.sort(result);
           return result;
+     }
     /** Mark the current set of controls, if any, as obsolete and deallocate them. If further need of the controls will cause new controls to be created.
+    public ArrayList getLanguageCodes() {
+    ArrayList result = new ArrayList();
+    Iterator key_iter = known_languages.keySet().iterator();
+    while(key_iter.hasNext()) {
+        result.add(known_languages.get(key_iter.next()));
+    }
+    //for(Enumeration keys = known_languages.keys(); keys.hasMoreElements(); ) {
+    //  result.add(known_languages.get(keys.nextElement()));
+    //}
+    //Collections.sort(result);
+    return result;
+    }
+    /** Mark the current set of controls, if any, as obsolete and deallocate them. If further need of the controls will cause new controls to be created.
     * @see org.greenstone.gatherer.cdm.IndexManager.Control
     */
      public void invalidateControls() {
           if(controls != null) {
                 controls.destroy();
+          }
           controls = null;
+     }
      /** Determine if the given language is the current default language.
+    public void invalidateControls() {
+    if(controls != null) {
+        controls.destroy();
+    }
+    controls = null;
+    }
+    /** Determine if the given language is the current default language.
       * @param language The <strong>Language</strong> to test.
       * @return <i>true</i> if the language is the default one, <i>false</i> otherwise.
       */
      public boolean isDefaultLanguage(Language language) {
           return (language.equals(default_language));
+     }
      /** This method attempts to parse a language command from the given string. If such a command is parsed, it is immediately added to the list of languages.
+    public boolean isDefaultLanguage(Language language) {
+    return (language.equals(default_language));
+    }
+    /** This method attempts to parse a language command from the given string. If such a command is parsed, it is immediately added to the list of languages.
       * @param command The <strong>String</strong> containing a possible language command.
       * @return A <i>boolean</i> which is <i>true</i> if a command was parsed, <i>false</i> otherwise.
       * @see org.greenstone.gatherer.cdm.Language
       */
      public boolean parse(String command) {
           String command_lc = command.toLowerCase();
           if(command_lc.startsWith("languages")) {
                 StringTokenizer tokenizer = new StringTokenizer(command);
                 tokenizer.nextToken();
                 while(tokenizer.hasMoreTokens()) {
                      String code = tokenizer.nextToken();
                      if(known_languages.containsKey(code)) {
                           Language language = (Language)known_languages.get(code);
                           addElement(new Language(language));
+                     }
                      else {
                           addElement(new Language(code, code, false));
+                     }
+                }
                 return true;
+          }
           if(command_lc.startsWith("defaultlanguage")) {
                 StringTokenizer tokenizer = new StringTokenizer(command);
                 tokenizer.nextToken();
                 if(tokenizer.hasMoreTokens()) {
                      String code = tokenizer.nextToken();
                      Language language = getLanguage(code, true);
                      if(language == null) {
                           language = new Language(code, (String)known_languages.get(code), true);
                           addElement(language);
+                     }
                      else {
                           language.setDefault(true);
+                     }
                      setDefault(language);
+                }
                 return true;
+          }
           return false;
+     }
      /** Method to cause the list appearance to update if the selection changes. */
      public void refreshAppearance() {
           fireContentsChanged(this, 0, size());
+     }
      /** Method to remove a certain language.
+    public boolean parse(String command) {
+    String command_lc = command.toLowerCase();
+    if(command_lc.startsWith("languages")) {
+        StringTokenizer tokenizer = new StringTokenizer(command);
+        tokenizer.nextToken();
+        while(tokenizer.hasMoreTokens()) {
+        String code = tokenizer.nextToken();
+        if(known_languages.containsKey(code)) {
+            Language language = (Language)known_languages.get(code);
+            addElement(new Language(language));
+        }
+        else {
+            addElement(new Language(code, code, false));
+        }
+        }
+        return true;
+    }
+    if(command_lc.startsWith("defaultlanguage")) {
+        StringTokenizer tokenizer = new StringTokenizer(command);
+        tokenizer.nextToken();
+        if(tokenizer.hasMoreTokens()) {
+        String code = tokenizer.nextToken();
+        Language language = getLanguage(code, true);
+        if(language == null) {
+            language = new Language(code, (String)known_languages.get(code), true);
+            addElement(language);
+        }
+        else {
+            language.setDefault(true);
+        }
+        setDefault(language);
+        }
+        return true;
+    }
+    return false;
+    }
+    /** Method to cause the list appearance to update if the selection changes. */
+    public void refreshAppearance() {
+    fireContentsChanged(this, 0, size());
+    }
+    /** Method to remove a certain language.
       * @param language The <strong>Language</strong> to remove.
       * @see org.greenstone.gatherer.Gatherer
       * @see org.greenstone.gatherer.collection.CollectionManager
       */
      public void removeLanguage(Language language) {
           removeElement(language);
           if(default_language != null && default_language.equals(language)) {
                 default_language = null;
+          }
           gatherer.c_man.configurationChanged();
+     }
      /** Method to set the default language.
+    public void removeLanguage(Language language) {
+    removeElement(language);
+    if(default_language != null && default_language.equals(language)) {
+        default_language = null;
+    }
+    gatherer.c_man.configurationChanged();
+    }
+    /** Method to set the default language.
       * @param language The <strong>Language</strong> to use as a default, or <i>null</i> for no default.
       * @see org.greenstone.gatherer.Gatherer
       * @see org.greenstone.gatherer.collection.CollectionManager
       */
      public void setDefault(Language language) {
           // Unset existing.
           Language old = null;
           if(default_language != null) {
                 old = default_language;
                 default_language.setDefault(false);
                 default_language = null;
+          }
           // Now set the new if its not null.
           if(language != null) {
                 default_language = language;
                 default_language.setDefault(true);
+          }
           // Now cause the model to refresh any lists that are listening.
           int start = 0;
           int end = size() - 1;
           if(default_language != null && old != null) {
                 int index_default = indexOf(default_language);
                 int index_old = indexOf(old);
                 if(index_default < index_old) {
                      start = index_default;
                      end = index_old;
+                }
                 else {
                      start = index_old;
                      end = index_default;
+                }
+          }
           else if(default_language != null) {
                 start = end = indexOf(default_language);
+          }
           else {
                 start = end = indexOf(old);
+          }
           fireContentsChanged(this, 0, size());
           gatherer.c_man.configurationChanged();
+     }
      /** Method to translate this object into a block of commands as you you expect to find in the collection configuration file.
+    public void setDefault(Language language) {
+    // Unset existing.
+    Language old = null;
+    if(default_language != null) {
+        old = default_language;
+        default_language.setDefault(false);
+        default_language = null;
+    }
+    // Now set the new if its not null.
+    if(language != null) {
+        default_language = language;
+        default_language.setDefault(true);
+    }
+    // Now cause the model to refresh any lists that are listening.
+    int start = 0;
+    int end = size() - 1;
+    if(default_language != null && old != null) {
+        int index_default = indexOf(default_language);
+        int index_old = indexOf(old);
+        if(index_default < index_old) {
+        start = index_default;
+        end = index_old;
+        }
+        else {
+        start = index_old;
+        end = index_default;
+        }
+    }
+    else if(default_language != null) {
+        start = end = indexOf(default_language);
+    }
+    else {
+        start = end = indexOf(old);
+    }
+    fireContentsChanged(this, 0, size());
+    gatherer.c_man.configurationChanged();
+    }
+    /** Method to translate this object into a block of commands as you you expect to find in the collection configuration file.
       * @return A <strong>String</string> containing a series of commands.
       */
      public String toString() {
           StringBuffer text = new StringBuffer();
           if(size() > 1) {
                 text.append("languages ");
                 for(int i = 0; i < size(); i++) {
                      Language language = (Language) get(i);
                      text.append(language.getCode());
                      if(i < size() - 1) {
                           text.append(" ");
+                     }
                      else {
                           text.append("\n");
+                     }
+                }
+    public String toString() {
+    StringBuffer text = new StringBuffer();
+    if(size() > 1) {
+        text.append("languages ");
+        for(int i = 0; i < size(); i++) {
+        Language language = (Language) get(i);
+        text.append(language.getCode());
+        if(i < size() - 1) {
+            text.append(" ");
+        }
+        else {
+            text.append("\n");
+        }
+        }
                 // Only bother with default language if there is more than one language.
                 if(default_language != null) {
                      text.append("defaultlanguage ");
                      text.append(default_language.getCode());
                      text.append("\n");
+                }
                 text.append("\n");
+          }
           return text.toString();
+     }
      /** Overloaded to call get with both a key and an empty argument array.
+        if(default_language != null) {
+        text.append("defaultlanguage ");
+        text.append(default_language.getCode());
+        text.append("\n");
+        }
+        text.append("\n");
+    }
+    return text.toString();
+    }
+    /** Overloaded to call get with both a key and an empty argument array.
       * @param key A <strong>String</strong> which is mapped to a initial String within the ResourceBundle.
       * @return A <strong>String</strong> which has been referenced by the key String and that either contains no argument fields, or has had the argument fields automatiically populated with formatting Strings of with argument String provided in the get call.
       */
      private String get(String key) {
           return get(key, null);
+     }
      /** Used to retrieve a property value from the Locale specific ResourceBundle, based upon the key and arguments supplied. If the key cannot be found or if some other part of the call fails a default (English) error message is returned. <BR>
+    private String get(String key) {
+    return get(key, null);
+    }
+    /** Used to retrieve a property value from the Locale specific ResourceBundle, based upon the key and arguments supplied. If the key cannot be found or if some other part of the call fails a default (English) error message is returned. <BR>
       * Here the get recieves a second argument which is an array of Strings used to populate argument fields, denoted {<I>n</I>}, within the value String returned. Note that argument numbers greater than or equal to 32 are automatically mapped to the formatting String named Farg<I>n</I>.
       * @param key A <strong>String</strong> which is mapped to a initial String within the ResourceBundle.
 …
       * @see org.greenstone.gatherer.Dictionary
       */
      private String get(String key, String args[]) {
           if(key.indexOf('.') == -1) {
                 key = "CDM.LanguageManager." + key;
+          }
           return gatherer.dictionary.get(key, args);
+     }
      /** This method loads a series of code->language mappings into known_languages, by reading from the 'languages.dat' file, which is essentially a verbatim copy of the ISO 639 Standard.
+    private String get(String key, String args[]) {
+    if(key.indexOf('.') == -1) {
+        key = "CDM.LanguageManager." + key;
+    }
+    return gatherer.dictionary.get(key, args);
+    }
+    /** This method loads a series of code->language mappings into known_languages, by reading from the 'languages.dat' file, which is essentially a verbatim copy of the ISO 639 Standard.
      * @see org.greenstone.gatherer.cdm.Language
       */
+     private void loadLanguages() {
+          try {
+                File in_file = new File("languages.dat");
+                FileReader in_reader = new FileReader(in_file);
+                BufferedReader in = new BufferedReader(in_reader);
+                String entry = null;
+                while((entry = in.readLine()) != null) {
+                     if(!entry.startsWith("#")) {
+                          StringTokenizer tokenizer = new StringTokenizer(entry);
+                          String name = tokenizer.nextToken();
+                          String code = tokenizer.nextToken().toLowerCase();
+                          Language language = new Language(code, name, false);
+                          known_languages.put(code, language);
+                     }
+                }
+                in.close();
+          }
+          catch (Exception error) {
+                error.printStackTrace();
+          }
+     }
+     /** This class represents the visual component of the Language Manager. */
+     private class Control
+          extends JPanel {
+          /** The button to add a new language support. */
+          private JButton add = null;
+          /** The button to clear the current default language. */
+          private JButton clear_default = null;
+          /** The button to remove a supported language. */
+          private JButton remove = null;
+          /** The button to set the current language as the default one. */
+          private JButton set_default = null;
+          /** A button to active the translation manager prompt. */
+          private JButton translate = null;
+          /** A combobox listing the available supported languages. */
+          private JComboBox selector = null;
+          /** The label denoting the default language. */
+          private JLabel default_language_label = null;
+          /** The label denoting the language selector. */
+          private JLabel selector_label = null;
+          /** The title label of this control view. */
+          private JLabel title = null;
+          /** A list of currently supported languages. */
+          private JList list = null;
+          /** The pane in which the control buttons are placed. */
+          private JPanel button_pane = null;
+          /** The pane onto which all other panes are placed. */
+          private JPanel central_pane = null;
+          /** The pane to the left containing editing controls. */
+          private JPanel control_pane = null;
+          /** A panel used to correctly layout the default language box. */
+          private JPanel default_language_pane = null;
+          /** The display pane contains the title and instruction controls. */
+          private JPanel display_pane = null;
+          /** The pane which holds everything the display pane doesn't! */
+          private JPanel lower_pane = null;
+          /** The pane containing the selector combobox. */
+          private JPanel selector_pane = null;
+          /** A text area displaying inline instructions. */
+          private JTextArea instructions = null;
+          /** A description of the language currently selected. */
+          private JTextArea description = null;
+          /** The text field showing the currently name of the default language. Non-editable. */
+          private JTextField default_language_value = null;
+          /** Constructor.
+            * @see org.greenstone.gatherer.cdm.LanguageManager.Control.AddListener
+            * @see org.greenstone.gatherer.cdm.LanguageManager.Control.ClearDefaultListener
+            * @see org.greenstone.gatherer.cdm.LanguageManager.Control.ListListener
+            * @see org.greenstone.gatherer.cdm.LanguageManager.Control.RemoveListener
+            * @see org.greenstone.gatherer.cdm.LanguageManager.Control.SelectorListener
+            * @see org.greenstone.gatherer.cdm.LanguageManager.Control.SetDefaultListener
+            * @see org.greenstone.gatherer.cdm.LanguageManager.Control.TranslateListener
+    private void loadLanguages() {
+    try {
+        File in_file = new File("languages.dat");
+        FileReader in_reader = new FileReader(in_file);
+        BufferedReader in = new BufferedReader(in_reader);
+        String entry = null;
+        while((entry = in.readLine()) != null) {
+        if(!entry.startsWith("#")) {
+            StringTokenizer tokenizer = new StringTokenizer(entry);
+            String name = tokenizer.nextToken();
+            String code = tokenizer.nextToken().toLowerCase();
+            Language language = new Language(code, name, false);
+            known_languages.put(code, language);
+        }
+        }
+        in.close();
+    }
+    catch (Exception error) {
+        error.printStackTrace();
+    }
+    }
+    /** This class represents the visual component of the Language Manager. */
+    private class Control
+    extends JPanel {
+    /** The button to add a new language support. */
+    private JButton add = null;
+    /** The button to clear the current default language. */
+    private JButton clear_default = null;
+    /** The button to remove a supported language. */
+    private JButton remove = null;
+    /** The button to set the current language as the default one. */
+    private JButton set_default = null;
+    /** A button to active the translation manager prompt. */
+    private JButton translate = null;
+    /** A combobox listing the available supported languages. */
+    private JComboBox selector = null;
+    /** The label denoting the default language. */
+    private JLabel default_language_label = null;
+    /** The label denoting the language selector. */
+    private JLabel selector_label = null;
+    /** The title label of this control view. */
+    private JLabel title = null;
+    /** A list of currently supported languages. */
+    private JList list = null;
+    /** The pane in which the control buttons are placed. */
+    private JPanel button_pane = null;
+    /** The pane onto which all other panes are placed. */
+    private JPanel central_pane = null;
+    /** The pane to the left containing editing controls. */
+    private JPanel control_pane = null;
+    /** A panel used to correctly layout the default language box. */
+    private JPanel default_language_pane = null;
+    /** The display pane contains the title and instruction controls. */
+    private JPanel display_pane = null;
+    /** The pane which holds everything the display pane doesn't! */
+    private JPanel lower_pane = null;
+    /** The pane containing the selector combobox. */
+    private JPanel selector_pane = null;
+    /** A text area displaying inline instructions. */
+    private JTextArea instructions = null;
+    /** A description of the language currently selected. */
+    private JTextArea description = null;
+    /** The text field showing the currently name of the default language. Non-editable. */
+    private JTextField default_language_value = null;
+    /** Constructor.
+     * @see org.greenstone.gatherer.cdm.LanguageManager.Control.AddListener
+     * @see org.greenstone.gatherer.cdm.LanguageManager.Control.ClearDefaultListener
+     * @see org.greenstone.gatherer.cdm.LanguageManager.Control.ListListener
+     * @see org.greenstone.gatherer.cdm.LanguageManager.Control.RemoveListener
+     * @see org.greenstone.gatherer.cdm.LanguageManager.Control.SelectorListener
+     * @see org.greenstone.gatherer.cdm.LanguageManager.Control.SetDefaultListener
+     * @see org.greenstone.gatherer.cdm.LanguageManager.Control.TranslateListener
+     */
+    public Control() {
+        super();
+                // Creation.
+        title = new JLabel(get("Title"));
+        title.setHorizontalAlignment(JLabel.CENTER);
+        title.setOpaque(true);
+        central_pane = new JPanel();
+        control_pane = new JPanel();
+        instructions = new JTextArea(get("Instructions"));
+        instructions.setBackground(Gatherer.config.getColor("coloring.collection_tree_background", false));
+        instructions.setEditable(false);
+        instructions.setLineWrap(true);
+        instructions.setWrapStyleWord(true);
+        selector_pane = new JPanel();
+        selector_label = new JLabel(get("Selector"));
+        selector = new JComboBox(getLanguageCodes().toArray());
+        display_pane = new JPanel();
+        list = new JList(model);
+        list.setCellRenderer(new ListRenderer());
+        default_language_pane = new JPanel();
+        default_language_label = new JLabel(get("Default_Language"));
+        default_language_label.setBorder(BorderFactory.createEmptyBorder(0,0,0,5));
+        if(default_language == null) {
+        default_language_value = new JTextField();
+        }
+        else {
+        default_language_value = new JTextField(default_language.toString());
+        }
+        default_language_value.setBackground(Color.white);
+        default_language_value.setEditable(false);
+        button_pane = new JPanel();
+        add = new JButton(get("Add"));
+        add.setMnemonic(KeyEvent.VK_A);
+        if(selector.getSelectedItem() != null) {
+        add.setEnabled(true);
+        }
+        else {
+        add.setEnabled(false);
+        }
+        remove = new JButton(get("Remove"));
+        remove.setMnemonic(KeyEvent.VK_R);
+        remove.setEnabled(false);
+        clear_default = new JButton(get("Clear_Default"));
+        clear_default.setMnemonic(KeyEvent.VK_C);
+        clear_default.setEnabled(false);
+        set_default = new JButton(get("Set_Default"));
+        set_default.setMnemonic(KeyEvent.VK_S);
+        set_default.setEnabled(false);
+        lower_pane = new JPanel();
+        translate = new JButton(get("Translate"));
+        translate.setMnemonic(KeyEvent.VK_T);
+                // Set up and connect listeners.
+        add.addActionListener(new AddListener());
+        clear_default.addActionListener(new ClearDefaultListener());
+        remove.addActionListener(new RemoveListener());
+        selector.addActionListener(new SelectorListener());
+        set_default.addActionListener(new SetDefaultListener());
+        translate.addActionListener(new TranslateListener());
+        list.addListSelectionListener(new ListListener());
+                // Layout components.
+        selector_pane.setBorder(BorderFactory.createEmptyBorder(2,2,2,2));
+        selector_pane.setLayout(new BorderLayout());
+        selector_pane.add(selector_label, BorderLayout.WEST);
+        selector_pane.add(selector, BorderLayout.CENTER);
+        instructions.setBorder(BorderFactory.createEmptyBorder(2,5,2,5));
+        control_pane.setBorder(BorderFactory.createEmptyBorder(5,5,5,5));
+        control_pane.setLayout(new BorderLayout());
+        control_pane.add(new JScrollPane(instructions), BorderLayout.CENTER);
+        control_pane.add(selector_pane, BorderLayout.SOUTH);
+        default_language_pane.setBorder
+        (BorderFactory.createCompoundBorder
+         (BorderFactory.createCompoundBorder
+          (BorderFactory.createEmptyBorder(5,5,5,5),
+           BorderFactory.createRaisedBevelBorder()),
+          BorderFactory.createEmptyBorder(2,2,2,2)));
+        default_language_pane.setLayout(new BorderLayout());
+        default_language_pane.add(default_language_label, BorderLayout.WEST);
+        default_language_pane.add(default_language_value, BorderLayout.CENTER);
+        display_pane.setBorder(BorderFactory.createEmptyBorder(5,0,5,5));
+        display_pane.setLayout(new BorderLayout());
+        display_pane.add(new JScrollPane(list), BorderLayout.CENTER);
+        display_pane.add(default_language_pane, BorderLayout.SOUTH);
+        central_pane.setLayout(new GridLayout(1,2));
+        central_pane.add(control_pane);
+        central_pane.add(display_pane);
+        button_pane.setLayout(new GridLayout(2,2));
+        button_pane.add(add);
+        button_pane.add(remove);
+        button_pane.add(clear_default);
+        button_pane.add(set_default);
+        lower_pane.setBorder(BorderFactory.createEmptyBorder(0,5,5,5));
+        lower_pane = new JPanel(new BorderLayout());
+        lower_pane.add(button_pane, BorderLayout.NORTH);
+        lower_pane.add(translate, BorderLayout.CENTER);
+        setBorder(BorderFactory.createEmptyBorder(5,5,5,5));
+        setLayout(new BorderLayout());
+        add(title, BorderLayout.NORTH);
+        add(central_pane, BorderLayout.CENTER);
+        add(lower_pane, BorderLayout.SOUTH);
+    }
+    /** Destructor.
             */
+          public Control() {
+                super();
+                // Creation.
+                title = new JLabel(get("Title"));
+                title.setHorizontalAlignment(JLabel.CENTER);
+                title.setOpaque(true);
+                central_pane = new JPanel();
+                control_pane = new JPanel();
+                instructions = new JTextArea(get("Instructions"));
+                instructions.setBackground(Gatherer.config.getColor("coloring.collection_tree_background", false));
+                instructions.setEditable(false);
+                instructions.setLineWrap(true);
+                instructions.setWrapStyleWord(true);
+                selector_pane = new JPanel();
+                selector_label = new JLabel(get("Selector"));
+                selector = new JComboBox(getLanguageCodes().toArray());
+                display_pane = new JPanel();
+                list = new JList(model);
+                list.setCellRenderer(new ListRenderer());
+                default_language_pane = new JPanel();
+                default_language_label = new JLabel(get("Default_Language"));
+                default_language_label.setBorder(BorderFactory.createEmptyBorder(0,0,0,5));
+                if(default_language == null) {
+                     default_language_value = new JTextField();
+                }
+                else {
+                     default_language_value = new JTextField(default_language.toString());
+                }
+                default_language_value.setBackground(Color.white);
+                default_language_value.setEditable(false);
+                button_pane = new JPanel();
+                add = new JButton(get("Add"));
+                add.setMnemonic(KeyEvent.VK_A);
+                if(selector.getSelectedItem() != null) {
+                     add.setEnabled(true);
+                }
+                else {
+                     add.setEnabled(false);
+                }
+                remove = new JButton(get("Remove"));
+                remove.setMnemonic(KeyEvent.VK_R);
+                remove.setEnabled(false);
+                clear_default = new JButton(get("Clear_Default"));
+                clear_default.setMnemonic(KeyEvent.VK_C);
+                clear_default.setEnabled(false);
+                set_default = new JButton(get("Set_Default"));
+                set_default.setMnemonic(KeyEvent.VK_S);
+                set_default.setEnabled(false);
+                lower_pane = new JPanel();
+                translate = new JButton(get("Translate"));
+                translate.setMnemonic(KeyEvent.VK_T);
+                // Set up and connect listeners.
+                add.addActionListener(new AddListener());
+                clear_default.addActionListener(new ClearDefaultListener());
+                remove.addActionListener(new RemoveListener());
+                selector.addActionListener(new SelectorListener());
+                set_default.addActionListener(new SetDefaultListener());
+                translate.addActionListener(new TranslateListener());
+                list.addListSelectionListener(new ListListener());
+                // Layout components.
+                selector_pane.setBorder(BorderFactory.createEmptyBorder(2,2,2,2));
+                selector_pane.setLayout(new BorderLayout());
+                selector_pane.add(selector_label, BorderLayout.WEST);
+                selector_pane.add(selector, BorderLayout.CENTER);
+                instructions.setBorder(BorderFactory.createEmptyBorder(2,5,2,5));
+                control_pane.setBorder(BorderFactory.createEmptyBorder(5,5,5,5));
+                control_pane.setLayout(new BorderLayout());
+                control_pane.add(new JScrollPane(instructions), BorderLayout.CENTER);
+                control_pane.add(selector_pane, BorderLayout.SOUTH);
+                default_language_pane.setBorder
+                     (BorderFactory.createCompoundBorder
+                      (BorderFactory.createCompoundBorder
+                        (BorderFactory.createEmptyBorder(5,5,5,5),
+                         BorderFactory.createRaisedBevelBorder()),
+                        BorderFactory.createEmptyBorder(2,2,2,2)));
+                default_language_pane.setLayout(new BorderLayout());
+                default_language_pane.add(default_language_label, BorderLayout.WEST);
+                default_language_pane.add(default_language_value, BorderLayout.CENTER);
+                display_pane.setBorder(BorderFactory.createEmptyBorder(5,0,5,5));
+                display_pane.setLayout(new BorderLayout());
+                display_pane.add(new JScrollPane(list), BorderLayout.CENTER);
+                display_pane.add(default_language_pane, BorderLayout.SOUTH);
+                central_pane.setLayout(new GridLayout(1,2));
+                central_pane.add(control_pane);
+                central_pane.add(display_pane);
+                button_pane.setLayout(new GridLayout(2,2));
+                button_pane.add(add);
+                button_pane.add(remove);
+                button_pane.add(clear_default);
+                button_pane.add(set_default);
+                lower_pane.setBorder(BorderFactory.createEmptyBorder(0,5,5,5));
+                lower_pane = new JPanel(new BorderLayout());
+                lower_pane.add(button_pane, BorderLayout.NORTH);
+                lower_pane.add(translate, BorderLayout.CENTER);
+                setBorder(BorderFactory.createEmptyBorder(5,5,5,5));
+                setLayout(new BorderLayout());
+                add(title, BorderLayout.NORTH);
+                add(central_pane, BorderLayout.CENTER);
+                add(lower_pane, BorderLayout.SOUTH);
+          }
+          /** Destructor.
+    public void destroy() {
+    }
+    /** We override the updateUI method so that we can ensure we are scrolled to the top of the instructions box first.
             */
+          public void destroy() {
+          }
+          /** We override the updateUI method so that we can ensure we are scrolled to the top of the instructions box first.
+            */
+          public void updateUI() {
+                if(instructions != null) {
+                     instructions.setCaretPosition(0);
+                }
+                super.updateUI();
+          }
+          /** Listens for actions apon the 'add' button in the LanguageManager controls, and if detected calls the add method of the manager with a newly created language. */
+          private class AddListener
+                implements ActionListener {
+    public void updateUI() {
+        if(instructions != null) {
+        instructions.setCaretPosition(0);
+        }
+        super.updateUI();
+    }
+    /** Listens for actions apon the 'add' button in the LanguageManager controls, and if detected calls the add method of the manager with a newly created language. */
+    private class AddListener
+        implements ActionListener {
                 /** Add a new language support.
+                * @param event An <strong>ActionEvent</strong>.
+                * @see org.greenstone.gatherer.cdm.Language
+                 * @param event An <strong>ActionEvent</strong>.
+                 * @see org.greenstone.gatherer.cdm.Language
+                 */
+        public void actionPerformed(ActionEvent event) {
+        Language language = (Language)selector.getSelectedItem();
+        if(language != null) {
+            addLanguage(new Language(language));
+        }
+        }
+    }
+    /** Listens for actions apon the 'clear default' button in the LanguageManager controls, and if detected calls the setDefault method of the manager with <i>null</i>. */
+    private class ClearDefaultListener
+        implements ActionListener {
+                /** Clear the default index.
+                 * @param event An <strong>ActionEvent</strong>.
                 */
+                public void actionPerformed(ActionEvent event) {
+                     Language language = (Language)selector.getSelectedItem();
+                     if(language != null) {
+                          addLanguage(new Language(language));
+                     }
+                }
+          }
+          /** Listens for actions apon the 'clear default' button in the LanguageManager controls, and if detected calls the setDefault method of the manager with <i>null</i>. */
+          private class ClearDefaultListener
+                implements ActionListener {
+                /** Clear the default index.
+                * @param event An <strong>ActionEvent</strong>.
+        public void actionPerformed(ActionEvent event) {
+        setDefault(null);
+        clear_default.setEnabled(false);
+        default_language_value.setText("");
+        }
+    }
+    /** Listens for actions apon the 'remove' button in the LanguageManager controls, and if detected calls the remove method of the manager with the language selected for removal. */
+    private class RemoveListener
+        implements ActionListener {
+                /** Remove the currently selected language, if any.
+                 * @param event An <strong>ActionEvent</strong>.
+                 * @see org.greenstone.gatherer.cdm.Language
+                 */
+        public void actionPerformed(ActionEvent event) {
+        if(!list.isSelectionEmpty()) {
+            removeLanguage((Language)list.getSelectedValue());
+            if(default_language == null) {
+            clear_default.setEnabled(false);
+            default_language_value.setText("");
+            }
+        }
+        }
+    }
+    /** Listens for selections wihtin the combobox on the LanguageManager controls, and if a change is detected enables, or disables, controls appropriately. */
+    private class SelectorListener
+        implements ActionListener {
+                /** Enable or disable controls depeding on selection.
+                 * @param event An <strong>ActionEvent</strong>.
                 */
+                public void actionPerformed(ActionEvent event) {
+                     setDefault(null);
+                     clear_default.setEnabled(false);
+                     default_language_value.setText("");
+                }
+          }
+          /** Listens for actions apon the 'remove' button in the LanguageManager controls, and if detected calls the remove method of the manager with the language selected for removal. */
+          private class RemoveListener
+                implements ActionListener {
+                /** Remove the currently selected language, if any.
+                * @param event An <strong>ActionEvent</strong>.
+                * @see org.greenstone.gatherer.cdm.Language
+        public void actionPerformed(ActionEvent event) {
+        if(selector.getSelectedItem() != null) {
+            add.setEnabled(true);
+            //description.setText((String)known_languages.get(code));
+        }
+        else {
+            add.setEnabled(false);
+            //description.setText("");
+        }
+        }
+    }
+    /** Listens for actions apon the 'set default' button in the LanguageManager controls, and if detected calls the <i>setDefault()</i> method of the manager with the language selected for default. */
+    private class SetDefaultListener
+        implements ActionListener {
+                /** Set the default index to the one currently selected, if any.
+                 * @param event An <strong>ActionEvent</strong>.
+                 * @see org.greenstone.gatherer.cdm.Language
+                 */
+        public void actionPerformed(ActionEvent event) {
+        if(!list.isSelectionEmpty()) {
+            setDefault((Language)list.getSelectedValue());
+            clear_default.setEnabled(true);
+            default_language_value.setText(default_language.toString());
+        }
+        }
+    }
+    /** Listens for actions apon the 'translate' button in the LanguageManager controls, and if detected creates a new <strong>TranslationManager</strong> to allow the user to tranlate. */
+    private class TranslateListener
+        implements ActionListener {
+                /** Create a new translation manager, but remember to clean up after it disposes.
+                 * @param event An <strong>ActionEvent</strong>.
+                 * @see org.greenstone.gatherer.cdm.TranslationManager
+                 */
+        public void actionPerformed(ActionEvent event) {
+        TranslationManager tm = new TranslationManager(gatherer, manager);
+        tm.destroy();
+        }
+    }
+    /** Listens for selections within the list on the LanguageManager controls, and if a change is detected enables, or disables, controls appropriately. */
+    private class ListListener
+        implements ListSelectionListener {
+                /** Enable or disable controls depending on the current list selection.
+                 * @param event A <strong>ListSelectionEvent</strong>.
                 */
+                public void actionPerformed(ActionEvent event) {
+                     if(!list.isSelectionEmpty()) {
+                          removeLanguage((Language)list.getSelectedValue());
+                          if(default_language == null) {
+                                clear_default.setEnabled(false);
+                                default_language_value.setText("");
+                          }
+                     }
+                }
+          }
+          /** Listens for selections wihtin the combobox on the LanguageManager controls, and if a change is detected enables, or disables, controls appropriately. */
+          private class SelectorListener
+                implements ActionListener {
+                /** Enable or disable controls depeding on selection.
+                * @param event An <strong>ActionEvent</strong>.
+                */
+                public void actionPerformed(ActionEvent event) {
+                     if(selector.getSelectedItem() != null) {
+                          add.setEnabled(true);
+                          //description.setText((String)known_languages.get(code));
+                     }
+                     else {
+                          add.setEnabled(false);
+                          //description.setText("");
+                     }
+                }
+          }
+          /** Listens for actions apon the 'set default' button in the LanguageManager controls, and if detected calls the <i>setDefault()</i> method of the manager with the language selected for default. */
+          private class SetDefaultListener
+                implements ActionListener {
+                /** Set the default index to the one currently selected, if any.
+                * @param event An <strong>ActionEvent</strong>.
+                * @see org.greenstone.gatherer.cdm.Language
+                */
+                public void actionPerformed(ActionEvent event) {
+                     if(!list.isSelectionEmpty()) {
+                          setDefault((Language)list.getSelectedValue());
+                          clear_default.setEnabled(true);
+                          default_language_value.setText(default_language.toString());
+                     }
+                }
+          }
+          /** Listens for actions apon the 'translate' button in the LanguageManager controls, and if detected creates a new <strong>TranslationManager</strong> to allow the user to tranlate. */
+          private class TranslateListener
+                implements ActionListener {
+                /** Create a new translation manager, but remember to clean up after it disposes.
+                * @param event An <strong>ActionEvent</strong>.
+                * @see org.greenstone.gatherer.cdm.TranslationManager
+                */
+                public void actionPerformed(ActionEvent event) {
+                     TranslationManager tm = new TranslationManager(gatherer, manager);
+                     tm.destroy();
+                }
+          }
+          /** Listens for selections within the list on the LanguageManager controls, and if a change is detected enables, or disables, controls appropriately. */
+          private class ListListener
+                implements ListSelectionListener {
+                /** Enable or disable controls depending on the current list selection.
+                * @param event A <strong>ListSelectionEvent</strong>.
+                */
+                public void valueChanged(ListSelectionEvent event) {
+                     if(list.isSelectionEmpty()) {
+                          remove.setEnabled(false);
+                          set_default.setEnabled(false);
+                     }
+                     else {
+                          remove.setEnabled(true);
+                          set_default.setEnabled(true);
+                     }
+                     refreshAppearance();
+                }
+          }
+          /** Our list cel renderer which renders the default cell just a little different. */
+          private class ListRenderer
+                extends DefaultListCellRenderer {
+        public void valueChanged(ListSelectionEvent event) {
+        if(list.isSelectionEmpty()) {
+            remove.setEnabled(false);
+            set_default.setEnabled(false);
+        }
+        else {
+            remove.setEnabled(true);
+            set_default.setEnabled(true);
+        }
+        refreshAppearance();
+        }
+    }
+    /** Our list cel renderer which renders the default cell just a little different. */
+    private class ListRenderer
+        extends DefaultListCellRenderer {
                 /** Method to produce the component used to display an entry in the list.
                  * @param list The <strong>JList</strong> the component will be placed in.
 …
                  * @see org.greenstone.gatherer.cdm.Language
                  */
                 public Component getListCellRendererComponent(JList list, Object value, int index, boolean isSelected, boolean cellHasFocus) {
                      Component component = super.getListCellRendererComponent(list, value, index, isSelected, cellHasFocus);
                      Language language = (Language) value;
                      if(language.isDefault() && !isSelected) {
                           component.setBackground(Gatherer.config.getColor("coloring.workspace_selection_background", false));
+                     }
                      if(component instanceof JLabel) {
                           ((JLabel)component).setOpaque(true);
+                     }
                      return component;
+                }
+          }
+     }
+        public Component getListCellRendererComponent(JList list, Object value, int index, boolean isSelected, boolean cellHasFocus) {
+        Component component = super.getListCellRendererComponent(list, value, index, isSelected, cellHasFocus);
+        Language language = (Language) value;
+        if(language.isDefault() && !isSelected) {
+            component.setBackground(Gatherer.config.getColor("coloring.workspace_selection_background", false));
+        }
+        if(component instanceof JLabel) {
+            ((JLabel)component).setOpaque(true);
+        }
+        return component;
+        }
+    }
+    }
+}

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

-              r4293
+              r4366
 import org.w3c.dom.NodeList;
 /** Unlike its namesake in the msm package, this class really only knows how to produce a simple visual representation of the currently imported metadata sets. It is also read-only, so should be fairly straight forward.
 * @author John Thompson, Greenstone Digital Library, University of Waikato
 * @version 2.3
 * @see org.greenstone.gatherer.msm.MetadataSetManager
 */
+ * @author John Thompson, Greenstone Digital Library, University of Waikato
+ * @version 2.3
+ * @see org.greenstone.gatherer.msm.MetadataSetManager
+ */
 public class MetadataSetManager
      extends DynamicListModel
      implements MSMListener {
      /** The visual contols used to review the metadata sets. */
      private Control controls = null;
      /** A reference to the Gatherer. */
      private Gatherer gatherer = null;
      /** A reference to ourselves so our inner classes can refer to us. */
      private DynamicListModel model = null;
      /** Constructor.
       * @param gatherer A reference to the <strong>Gatherer</strong>.
       * @see org.greenstone.gatherer.collection.CollectionManager
       * @see org.greenstone.gatherer.msm.MetadataSetManager
       */
      public MetadataSetManager(Gatherer gatherer) {
           this.gatherer = gatherer;
           this.model = this;
           Gatherer.c_man.getCollection().msm.addMSMListener(this);
           loadMetadataSets();
+     }
      /** Destructor. Remove any references of this class from persistant objects.
+    extends DynamicListModel
+    implements MSMListener {
+    /** The visual contols used to review the metadata sets. */
+    private Control controls = null;
+    /** A reference to the Gatherer. */
+    private Gatherer gatherer = null;
+    /** A reference to ourselves so our inner classes can refer to us. */
+    private DynamicListModel model = null;
+    /** Constructor.
+     * @param gatherer A reference to the <strong>Gatherer</strong>.
+     * @see org.greenstone.gatherer.collection.CollectionManager
+     * @see org.greenstone.gatherer.msm.MetadataSetManager
+     */
+    public MetadataSetManager(Gatherer gatherer) {
+    this.gatherer = gatherer;
+    this.model = this;
+    Gatherer.c_man.getCollection().msm.addMSMListener(this);
+    loadMetadataSets();
+    }
+    /** Destructor. Remove any references of this class from persistant objects.
         * @see org.greenstone.gatherer.Gatherer
       * @see org.greenstone.gatherer.collection.CollectionManager
       * @see org.greenstone.gatherer.msm.MetadataSetManager
       */
      public void destroy() {
           gatherer.c_man.msm.removeMSMListener(this);
+     }
      /** Called when an element is changed within a set in the MSM, prompting us to refresh our list of elements being shown.
+    public void destroy() {
+    gatherer.c_man.msm.removeMSMListener(this);
+    }
+    /** Called when an element is changed within a set in the MSM, prompting us to refresh our list of elements being shown.
       * @param event A <strong>MSMEvent</strong> which encapsulates relevant data about the change.
         * @see org.greenstone.gatherer.cdm.MetadataSetManager.Control
       */
      public void elementChanged(MSMEvent event) {
           // Get the controls to refresh element list.
           if(controls != null) {
                 controls.refreshElementList();
+          }
+     }
      /** A method for retrieve the controls for this manager.
+    public void elementChanged(MSMEvent event) {
+    // Get the controls to refresh element list.
+    if(controls != null) {
+        controls.refreshElementList();
+    }
+    }
+    /** A method for retrieve the controls for this manager.
       * @see org.greenstone.gatherer.Dictionary
       * @see org.greenstone.gatherer.gui.Coloring
       * @see org.greenstone.gatherer.msm.MetadataSetManager
       */
      public Control getControls() {
           if(controls == null) {
                 controls = new Control();
+          }
           return controls;
+     }
      /** A method to invalidate the current set of controls, as they become obselete.
+    public Control getControls() {
+    if(controls == null) {
+        controls = new Control();
+    }
+    return controls;
+    }
+    /** A method to invalidate the current set of controls, as they become obselete.
         * @see org.greenstone.gatherer.cdm.MetadataSetManager.Control
       */
      public void invalidateControls() {
           if(controls != null) {
                 controls.destroy();
+          }
           controls = null;
+     }
      /** Called when a metadata value has undergone significant change.
+    public void invalidateControls() {
+    if(controls != null) {
+        controls.destroy();
+    }
+    controls = null;
+    }
+    /** Called when a metadata value has undergone significant change.
       * @param event A <strong>MSMEvent</strong> which encapsulates relevant data about the change.
       */
      public void metadataChanged(MSMEvent event) {
           // Couldn't care less.
+     }
      /** Called when a set is added or removed from the MSM.
+    public void metadataChanged(MSMEvent event) {
+    // Couldn't care less.
+    }
+    /** Called when a set is added or removed from the MSM.
       * @param event A <strong>MSMEvent</strong> which encapsulates relevant data about the change.
       */
      public void setChanged(MSMEvent event) {
           // Reload model.
           clear();
           loadMetadataSets();
+     }
     /** Select the selected element, given its name, and return the bounds of the selection. Used during search and replace.
+    public void setChanged(MSMEvent event) {
+    // Reload model.
+    clear();
+    loadMetadataSets();
+    }
+    /** Select the selected element, given its name, and return the bounds of the selection. Used during search and replace.
     * @param element The elements fully qualified name as a <strong>String</strong>.
     * @return The bounds of the selection as a <strong>Rectangle</strong>.
     * @see org.greenstone.gatherer.cdm.MetadataSetManager.Control
     */
      public Rectangle setSelectedElement(String element) {
           if(controls != null) {
                 return controls.setSelectedElement(element);
+          }
           return null;
+     }
      /** Prints out the contents of this manager, as they would appear in the collection configuration file.
+    public Rectangle setSelectedElement(String element) {
+    if(controls != null) {
+        return controls.setSelectedElement(element);
+    }
+    return null;
+    }
+    /** Prints out the contents of this manager, as they would appear in the collection configuration file.
       * @return A <strong>String</strong> containing a block of commands.
       * @see org.greenstone.gatherer.cdm.MetadataSetManager.SetWrapper
       */
      public String toString() {
           String text = "";
           for(int i = 0; i < size(); i++) {
                 SetWrapper set = (SetWrapper)get(i);
                 text = text + set.toString() + "\n";
+          }
           text = text + "\n";
           return text;
+     }
      /** Called when a significant change has occured to a value tree for a certain element, however we take no further action.
+    public String toString() {
+    String text = "";
+    for(int i = 0; i < size(); i++) {
+        SetWrapper set = (SetWrapper)get(i);
+        text = text + set.toString() + "\n";
+    }
+    text = text + "\n";
+    return text;
+    }
+    /** Called when a significant change has occured to a value tree for a certain element, however we take no further action.
       * @param event A <strong>MSMEvent</strong> containing information relevant to the event.
       */
      public void valueChanged(MSMEvent event) {
+     }
      /** Method to retrieve a phrase from the dictionary based on a key.
+    public void valueChanged(MSMEvent event) {
+    }
+    /** Method to retrieve a phrase from the dictionary based on a key.
       * @param key A <strong>String</strong> used to find the correct phrase.
       * @param args A <strong>String[]</strong> of arguments used in formatting and filling out the phrase.
       * @return A <strong>String</strong> containing the correct phrase with the correct formatting.
       */
      private String get(String key) {
           return get(key, null);
+     }
      /** Method to retrieve a phrase from the dictionary based on a key.
+    private String get(String key) {
+    return get(key, null);
+    }
+    /** Method to retrieve a phrase from the dictionary based on a key.
       * @param key A <strong>String</strong> used to find the correct phrase.
       * @return A <strong>String</strong> containing the correct phrase with the correct formatting.
 …
       * @see org.greenstone.gatherer.Gatherer
       */
      private String get(String key, String args[]) {
           if(key.indexOf(".") == -1) {
                 key = "CDM.MetadataSetManager." + key;
+          }
           return gatherer.dictionary.get(key, args);
+     }
      /** Retrieves the current list of loaded metadata sets, and builds a list model around them.
+    private String get(String key, String args[]) {
+    if(key.indexOf(".") == -1) {
+        key = "CDM.MetadataSetManager." + key;
+    }
+    return gatherer.dictionary.get(key, args);
+    }
+    /** Retrieves the current list of loaded metadata sets, and builds a list model around them.
         * @see org.greenstone.gatherer.Gatherer
         * @see org.greenstone.gatherer.cdm.MetadataSetManager.SetWrapper
 …
         * @see org.greenstone.gatherer.msm.MetadataSetManager
       */
+     private void loadMetadataSets() {
+          // We initialize the set_model with wrapped metadata sets. Note that when we call getSets() we also end up adding ourselves as a listener to the metadata set manager.
+          Vector sets = gatherer.c_man.getCollection().msm.getSets();
+          for(int i = 0; i < sets.size(); i++) {
+                addElement(new SetWrapper((MetadataSet)sets.get(i)));
+          }
+     }
+     /** This class creates and lays-out the various controls for reviewing the metadata sets, and their commands as they would appear in the collection configuration file. */
+     private class Control
+          extends JPanel {
+          /** The label denoting the element list. */
+          private JLabel element_label = null;
+          /** The label denoting the set list. */
+          private JLabel set_label = null;
+          /** The title of these controls. */
+          private JLabel title = null;
+          /** The list of elements for the choosen set. */
+          private JList element_list = null;
+          /** The list of sets in this collection. */
+          private JList set_list = null;
+          /** The panel onto which all other panels will be placed. */
+          private JPanel central_pane = null;
+          /** The panel onto which the element list will be placed. */
+          private JPanel element_pane = null;
+          /** The panel containing the title and instructions. */
+          private JPanel header_pane = null;
+          /** The panel containing the set list. */
+          private JPanel set_pane = null;
+          /** The text area of inline instructions. */
+          private JTextArea instructions = null;
+          /** The element model for the currently selected set. */
+          private Vector element_model = null;
+          /* Constructor.
+          * @see org.greenstone.gatherer.Coloring;
+          * @see org.greenstone.gatherer.Dictionary
+          * @see org.greenstone.gatherer.cdm.MetadataSetManager.ListListener
+          * @see org.greenstone.gatherer.msm.MetadataSetManager
+    private void loadMetadataSets() {
+    // We initialize the set_model with wrapped metadata sets. Note that when we call getSets() we also end up adding ourselves as a listener to the metadata set manager.
+    Vector sets = gatherer.c_man.getCollection().msm.getSets();
+    for(int i = 0; i < sets.size(); i++) {
+        addElement(new SetWrapper((MetadataSet)sets.get(i)));
+    }
+    }
+    /** This class creates and lays-out the various controls for reviewing the metadata sets, and their commands as they would appear in the collection configuration file. */
+    private class Control
+    extends JPanel {
+    /** The label denoting the element list. */
+    private JLabel element_label = null;
+    /** The label denoting the set list. */
+    private JLabel set_label = null;
+    /** The title of these controls. */
+    private JLabel title = null;
+    /** The list of elements for the choosen set. */
+    private JList element_list = null;
+    /** The list of sets in this collection. */
+    private JList set_list = null;
+    /** The panel onto which all other panels will be placed. */
+    private JPanel central_pane = null;
+    /** The panel onto which the element list will be placed. */
+    private JPanel element_pane = null;
+    /** The panel containing the title and instructions. */
+    private JPanel header_pane = null;
+    /** The panel containing the set list. */
+    private JPanel set_pane = null;
+    /** The text area of inline instructions. */
+    private JTextArea instructions = null;
+    /** The element model for the currently selected set. */
+    private Vector element_model = null;
+    /* Constructor.
+     * @see org.greenstone.gatherer.Coloring;
+     * @see org.greenstone.gatherer.Dictionary
+     * @see org.greenstone.gatherer.cdm.MetadataSetManager.ListListener
+     * @see org.greenstone.gatherer.msm.MetadataSetManager
+     */
+    public Control() {
+                // Create visual components
+        central_pane = new JPanel();
+        element_label = new JLabel(get("Elements"));
+        element_label.setHorizontalAlignment(JLabel.CENTER);
+        element_label.setOpaque(true);
+        element_list = new JList();
+        element_list.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
+        element_pane = new JPanel();
+        header_pane = new JPanel();
+        instructions = new JTextArea(get("Instructions"));
+        instructions.setBackground(Gatherer.config.getColor("coloring.collection_tree_background", false));
+        instructions.setEditable(false);
+        instructions.setLineWrap(true);
+        instructions.setRows(5);
+        instructions.setWrapStyleWord(true);
+        set_label = new JLabel(get("Sets"));
+        set_label.setHorizontalAlignment(JLabel.CENTER);
+        set_label.setOpaque(true);
+        set_list = new JList(model);
+        set_list.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
+        set_pane = new JPanel();
+        title = new JLabel(get("Title"));
+        title.setHorizontalAlignment(JLabel.CENTER);
+        title.setOpaque(true);
+                // Add listeners
+        set_list.addListSelectionListener(new ListListener());
+                // Layout
+        instructions.setBorder(BorderFactory.createEmptyBorder(2,5,2,5));
+        header_pane.setLayout(new BorderLayout());
+        header_pane.add(title, BorderLayout.NORTH);
+        header_pane.add(new JScrollPane(instructions), BorderLayout.CENTER);
+        set_pane.setLayout(new BorderLayout());
+        set_pane.add(set_label, BorderLayout.NORTH);
+        set_pane.add(new JScrollPane(set_list), BorderLayout.CENTER);
+        element_pane.setLayout(new BorderLayout());
+        element_pane.add(element_label, BorderLayout.NORTH);
+        element_pane.add(new JScrollPane(element_list), BorderLayout.CENTER);
+        central_pane.setLayout(new GridLayout(2,1));
+        central_pane.add(set_pane);
+        central_pane.add(element_pane);
+        setBorder(BorderFactory.createEmptyBorder(5,5,5,5));
+        setLayout(new BorderLayout());
+        add(header_pane, BorderLayout.NORTH);
+        add(central_pane, BorderLayout.CENTER);
+    }
+    /** Destructor.
           */
+          public Control() {
+                // Create visual components
+                central_pane = new JPanel();
+                element_label = new JLabel(get("Elements"));
+                element_label.setHorizontalAlignment(JLabel.CENTER);
+                element_label.setOpaque(true);
+                element_list = new JList();
+                element_list.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
+                element_pane = new JPanel();
+                header_pane = new JPanel();
+                instructions = new JTextArea(get("Instructions"));
+                instructions.setBackground(Gatherer.config.getColor("coloring.collection_tree_background", false));
+                instructions.setEditable(false);
+                instructions.setLineWrap(true);
+                instructions.setRows(5);
+                instructions.setWrapStyleWord(true);
+                set_label = new JLabel(get("Sets"));
+                set_label.setHorizontalAlignment(JLabel.CENTER);
+                set_label.setOpaque(true);
+                set_list = new JList(model);
+                set_list.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
+                set_pane = new JPanel();
+                title = new JLabel(get("Title"));
+                title.setHorizontalAlignment(JLabel.CENTER);
+                title.setOpaque(true);
+                // Add listeners
+                set_list.addListSelectionListener(new ListListener());
+                // Layout
+                instructions.setBorder(BorderFactory.createEmptyBorder(2,5,2,5));
+                header_pane.setLayout(new BorderLayout());
+                header_pane.add(title, BorderLayout.NORTH);
+                header_pane.add(new JScrollPane(instructions), BorderLayout.CENTER);
+                set_pane.setLayout(new BorderLayout());
+                set_pane.add(set_label, BorderLayout.NORTH);
+                set_pane.add(new JScrollPane(set_list), BorderLayout.CENTER);
+                element_pane.setLayout(new BorderLayout());
+                element_pane.add(element_label, BorderLayout.NORTH);
+                element_pane.add(new JScrollPane(element_list), BorderLayout.CENTER);
+                central_pane.setLayout(new GridLayout(2,1));
+                central_pane.add(set_pane);
+                central_pane.add(element_pane);
+                setBorder(BorderFactory.createEmptyBorder(5,5,5,5));
+                setLayout(new BorderLayout());
+                add(header_pane, BorderLayout.NORTH);
+                add(central_pane, BorderLayout.CENTER);
+          }
+          /** Destructor.
+          */
+          public void destroy() {
+          }
+          /** Update the element list. */
+          public void refreshElementList() {
+                element_list.updateUI();
+          }
+        /** Select the selected element, given its name, and return the bounds of the selection. Used during search and replace.
+    public void destroy() {
+    }
+    /** Update the element list. */
+    public void refreshElementList() {
+        element_list.updateUI();
+    }
+    /** Select the selected element, given its name, and return the bounds of the selection. Used during search and replace.
         * @param element The elements fully qualified name as a <strong>String</strong>.
         * @return The bounds of the selection as a <strong>Rectangle</strong>.
 …
         * @see org.greenstone.gatherer.cdm.MetadataSetManager.Control.ElementWrapper
         */
           public Rectangle setSelectedElement(String element) {
                 Rectangle bounds = null;
+    public Rectangle setSelectedElement(String element) {
+        Rectangle bounds = null;
                 // Parse off namespace
                 String namespace = element.substring(0, element.indexOf("."));
+        String namespace = element.substring(0, element.indexOf("."));
                 // Force the set list to show the correct entry.
                 ListModel s_model = set_list.getModel();
                 for(int i = 0; i < s_model.getSize(); i++) {
                      SetWrapper sw = (SetWrapper) s_model.getElementAt(i);
                      if(sw.getSet().getNamespace().equals(namespace)) {
                           set_list.setSelectedValue(sw, true);
+                     }
+                }
+        ListModel s_model = set_list.getModel();
+        for(int i = 0; i < s_model.getSize(); i++) {
+        SetWrapper sw = (SetWrapper) s_model.getElementAt(i);
+        if(sw.getSet().getNamespace().equals(namespace)) {
+            set_list.setSelectedValue(sw, true);
+        }
+        }
                 // Force the element list to show that name.
                 ListModel e_model = element_list.getModel();
                 for(int i = 0; i < e_model.getSize(); i++) {
                      ElementWrapper ew = (ElementWrapper) e_model.getElementAt(i);
                      if(ew.name().equals(element)) {
                           element_list.setSelectedValue(ew, true);
                           bounds = element_list.getCellBounds(i, i);
+                     }
+                }
+        ListModel e_model = element_list.getModel();
+        for(int i = 0; i < e_model.getSize(); i++) {
+        ElementWrapper ew = (ElementWrapper) e_model.getElementAt(i);
+        if(ew.name().equals(element)) {
+            element_list.setSelectedValue(ew, true);
+            bounds = element_list.getCellBounds(i, i);
+        }
+        }
                 // Return the bounds of the selected row.
                 return bounds;
+          }
           /** Overriden to ensure the instruction area is scrolled to top.
+        return bounds;
+    }
+    /** Overriden to ensure the instruction area is scrolled to top.
           */
           public void updateUI() {
                 if(instructions != null) {
                      instructions.setCaretPosition(0);
+                }
                 super.updateUI();
+          }
           private class ListListener
                 implements ListSelectionListener {
                 public void valueChanged(ListSelectionEvent event) {
                      if(!set_list.isSelectionEmpty()) {
                           MetadataSet set = ((SetWrapper)set_list.getSelectedValue()).getSet();
                           NodeList elements = set.getElements();
                           element_model = new Vector();
                           for(int i = 0; i < elements.getLength(); i++) {
                                 element_model.add(new ElementWrapper(elements.item(i)));
+                          }
                           Collections.sort(element_model);
                           element_list.setListData(element_model);
+                     }
+                }
+          }
+     }
      /** Provides a convience wrapper around a metadata set, that allows it to appear in the <strong>JList</strong> the same way it would in the collection configuration file. */
      private class SetWrapper {
           private MetadataSet set = null;
           public SetWrapper(MetadataSet set) {
                 this.set = set;
+          }
           public MetadataSet getSet() {
                 return set;
+          }
           public String toString() {
                 String namespace = set.getNamespace();
+    public void updateUI() {
+        if(instructions != null) {
+        instructions.setCaretPosition(0);
+        }
+        super.updateUI();
+    }
+    private class ListListener
+        implements ListSelectionListener {
+        public void valueChanged(ListSelectionEvent event) {
+        if(!set_list.isSelectionEmpty()) {
+            MetadataSet set = ((SetWrapper)set_list.getSelectedValue()).getSet();
+            NodeList elements = set.getElements();
+            element_model = new Vector();
+            for(int i = 0; i < elements.getLength(); i++) {
+            element_model.add(new ElementWrapper(elements.item(i)));
+            }
+            Collections.sort(element_model);
+            element_list.setListData(element_model);
+        }
+        }
+    }
+    }
+    /** Provides a convience wrapper around a metadata set, that allows it to appear in the <strong>JList</strong> the same way it would in the collection configuration file. */
+    private class SetWrapper {
+    private MetadataSet set = null;
+    public SetWrapper(MetadataSet set) {
+        this.set = set;
+    }
+    public MetadataSet getSet() {
+        return set;
+    }
+    public String toString() {
+        String namespace = set.getNamespace();
                 // Watch out for the greenstone set, with its namespace of ""
                 if(namespace == null || namespace.length() == 0) {
                      namespace = "greenstone";
+                }
                 return "metadataset " + namespace + " \"" + set.getFile().getName() + "\"";
+          }
+     }
+        if(namespace == null || namespace.length() == 0) {
+        namespace = "greenstone";
+        }
+        return "metadataset " + namespace + " \"" + set.getFile().getName() + "\"";
+    }
+    }
+}

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

-              r4293
+              r4366
 import javax.swing.JProgressBar;
 /** This class provides a progress bar to be displayed whenever the module must reload the plugin and classifier information, either automatically or if the user indicates a reload is needed.
 * @author John Thompson, Greenstone Digital Library, University of Waikato
 * @version 2.3
 */
+ * @author John Thompson, Greenstone Digital Library, University of Waikato
+ * @version 2.3
+ */
 public class ParsingProgress
      extends JDialog {
      /** The content pane within the dialog box. */
      private JPanel content_pane = null;
      /** The progress bar itself. */
      private JProgressBar progress = null;
      /** The default size of the progress dialog. */
      static final Dimension SIZE = new Dimension(400,75);
      /** Constructor.
       * @param title The title to show on the dialog, as a <strong>String</strong>.
       * @param message The message to show on the dialog, as a <strong>String</strong>.
       * @param max The total number of plugins/classifiers that have to be parsed before the progress bar can be disposed of, as an <i>int</i>.
+    extends JDialog {
+    /** The content pane within the dialog box. */
+    private JPanel content_pane = null;
+    /** The progress bar itself. */
+    private JProgressBar progress = null;
+    /** The default size of the progress dialog. */
+    static final Dimension SIZE = new Dimension(400,75);
+    /** Constructor.
+     * @param title The title to show on the dialog, as a <strong>String</strong>.
+     * @param message The message to show on the dialog, as a <strong>String</strong>.
+     * @param max The total number of plugins/classifiers that have to be parsed before the progress bar can be disposed of, as an <i>int</i>.
       */
      public ParsingProgress(String title, String message, int max) {
           super();
           this.setDefaultCloseOperation(DO_NOTHING_ON_CLOSE);
           this.setSize(SIZE);
           this.setTitle(title);
           // Creation
           this.content_pane = (JPanel) getContentPane();
           this.progress = new JProgressBar();
           this.progress.setMaximum(max);
           // Layout
           this.content_pane.setBorder(BorderFactory.createEmptyBorder(5,5,5,5));
           this.content_pane.setLayout(new BorderLayout());
           this.content_pane.add(new JLabel(message), BorderLayout.NORTH);
           this.content_pane.add(progress, BorderLayout.CENTER);
           // Center and display
           Dimension screen_size = Toolkit.getDefaultToolkit().getScreenSize();
           setLocation((screen_size.width - SIZE.width) / 2,
                           (screen_size.height - SIZE.height) / 2);
           show();
+     }
      public void destroy() {
+     }
      /** Method which increments the progress count by one, which should be called after every successful parsing of a classifier or plugin.
+    public ParsingProgress(String title, String message, int max) {
+    super();
+    this.setDefaultCloseOperation(DO_NOTHING_ON_CLOSE);
+    this.setSize(SIZE);
+    this.setTitle(title);
+    // Creation
+    this.content_pane = (JPanel) getContentPane();
+    this.progress = new JProgressBar();
+    this.progress.setMaximum(max);
+    // Layout
+    this.content_pane.setBorder(BorderFactory.createEmptyBorder(5,5,5,5));
+    this.content_pane.setLayout(new BorderLayout());
+    this.content_pane.add(new JLabel(message), BorderLayout.NORTH);
+    this.content_pane.add(progress, BorderLayout.CENTER);
+    // Center and display
+    Dimension screen_size = Toolkit.getDefaultToolkit().getScreenSize();
+    setLocation((screen_size.width - SIZE.width) / 2,
+            (screen_size.height - SIZE.height) / 2);
+    show();
+    }
+    public void destroy() {
+    }
+    /** Method which increments the progress count by one, which should be called after every successful parsing of a classifier or plugin.
       */
      public void inc() {
           progress.setValue(progress.getValue() + 1);
+     }
+    public void inc() {
+    progress.setValue(progress.getValue() + 1);
+    }
+}

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

-              r4293
+              r4366
 // ####################################################################################
 public class PlugIn
      extends ArrayList
      implements ArgumentContainer, Comparable, Serializable {
      /** A reference to the plugin that this one inherits from. */
      private PlugIn super_plugin = null;
      /** A string of custom arguments to pass to the plugin. */
      private String custom = null;
      /** A description of this plugin. */
      private String desc = null;
      /** The name of the plugin as it would appear in the collect.cfg file. */
      private String name = null;
      /** Default Constructor.
       */
      public PlugIn() {
           super();
+     }
      /** Constructor.
+    extends ArrayList
+    implements ArgumentContainer, Comparable, Serializable {
+    /** A reference to the plugin that this one inherits from. */
+    private PlugIn super_plugin = null;
+    /** A string of custom arguments to pass to the plugin. */
+    private String custom = null;
+    /** A description of this plugin. */
+    private String desc = null;
+    /** The name of the plugin as it would appear in the collect.cfg file. */
+    private String name = null;
+    /** Default Constructor.
+     */
+    public PlugIn() {
+    super();
+    }
+    /** Constructor.
       * @param name The name of this plugin as a <strong>String</strong>.
       * @param desc A description of this plugin as a <strong>String</strong>.
       * @param super_plugin The super class of this plugin, as a <strong>PlugIn</strong>.
       */
      public PlugIn(String name, String desc, PlugIn super_plugin) {
           super();
           this.desc = desc;
           this.name = name;
           this.super_plugin = super_plugin;
+     }
      /** Method to add an argument to this plugin. Only adds the argument if it isn't already present.
+    public PlugIn(String name, String desc, PlugIn super_plugin) {
+    super();
+    this.desc = desc;
+    this.name = name;
+    this.super_plugin = super_plugin;
+    }
+    /** Method to add an argument to this plugin. Only adds the argument if it isn't already present.
       * @param argument The <strong>Argument</strong> to add.
       */
      public void addArgument(Argument argument) {
           if(!contains(argument)) {
                 add(argument);
                 argument.setOwner(name);
+          }
+     }
      /** Method to compare two plugins for ordering.
+    public void addArgument(Argument argument) {
+    if(!contains(argument)) {
+        add(argument);
+        argument.setOwner(name);
+    }
+    }
+    /** Method to compare two plugins for ordering.
       * @param object The plugin we are comparing to, as an <strong>Object</strong>.
       * @return An <i>int</i> specifying the plugin order, using values as set out in <strong>String</strong>.
       * @see java.lang.String#compareTo
       */
      public int compareTo(Object object) {
           if(object != null && object instanceof PlugIn) {
                 PlugIn plugin = (PlugIn) object;
                 return name.compareTo(plugin.getName());
+          }
           return -1;
+     }
      /** This method produces a deep copy of this plugin. Note that this also creates a new copy of each of the super classes of plugins as well. This is the way it should be, as each assigned plugin may have different values for the higher plugins (such as BasPlug).
+    public int compareTo(Object object) {
+    if(object != null && object instanceof PlugIn) {
+        PlugIn plugin = (PlugIn) object;
+        return name.compareTo(plugin.getName());
+    }
+    return -1;
+    }
+    /** This method produces a deep copy of this plugin. Note that this also creates a new copy of each of the super classes of plugins as well. This is the way it should be, as each assigned plugin may have different values for the higher plugins (such as BasPlug).
       * @return A newly created <strong>PlugIn</strong> with the same details and <strong>Argument</strong>s as this one.
       */
      public PlugIn copy() {
           PlugIn copy = null;
           if(super_plugin == null) {
                 copy = new PlugIn(name, desc, null);
+          }
           else {
                 copy = new PlugIn(name, desc, super_plugin.copy());
+          }
           for(int i = 0; i < size(); i++) {
                 copy.addArgument(((Argument)get(i)).copy());
+          }
           return copy;
+     }
      /** Method to determine if two plugins are equal.
+    public PlugIn copy() {
+    PlugIn copy = null;
+    if(super_plugin == null) {
+        copy = new PlugIn(name, desc, null);
+    }
+    else {
+        copy = new PlugIn(name, desc, super_plugin.copy());
+    }
+    for(int i = 0; i < size(); i++) {
+        copy.addArgument(((Argument)get(i)).copy());
+    }
+    return copy;
+    }
+    /** Method to determine if two plugins are equal.
       * @param object The plugin to test against, as an <strong>Object</strong>.
       * @return <i>true</i> if the plugin names match, <i>false</i> otherwise.
       */
      public boolean equals(Object object) {
           if(object != null && compareTo(object) == 0) {
                 return true;
+          }
           return false;
+     }
      /** Method to retrieve an argument by its name.
+    public boolean equals(Object object) {
+    if(object != null && compareTo(object) == 0) {
+        return true;
+    }
+    return false;
+    }
+    /** Method to retrieve an argument by its name.
       * @param name The name of the argument as a <strong>String</strong>.
       * @return The <strong>Argument</strong> requested, or <i>null</i> if no such argument.
       */
      public Argument getArgument(String name) {
           // The name given may still include the '-'
           if(name.startsWith("-")) {
                 name = name.substring(1);
+          }
           ArrayList arguments = getArguments();
           for(int i = 0; i < arguments.size(); i++) {
                 Argument argument = (Argument)arguments.get(i);
                 if(argument.getName().equals(name)) {
                      return argument;
+                }
+          }
           return null;
+     }
      /** Method to retrieve all of the arguments available to a plugin, including both specific and general ones.
+    public Argument getArgument(String name) {
+    // The name given may still include the '-'
+    if(name.startsWith("-")) {
+        name = name.substring(1);
+    }
+    ArrayList arguments = getArguments();
+    for(int i = 0; i < arguments.size(); i++) {
+        Argument argument = (Argument)arguments.get(i);
+        if(argument.getName().equals(name)) {
+        return argument;
+        }
+    }
+    return null;
+    }
+    /** Method to retrieve all of the arguments available to a plugin, including both specific and general ones.
       * @return A <strong>Hashtable</strong> of arguments, with <name> -> <argument> entries.
       */
      public ArrayList getArguments() {
           ArrayList all_arguments = new ArrayList(this);
           Collections.sort(all_arguments);
           if(super_plugin != null) {
                 ArrayList super_arguments = super_plugin.getArguments();
                 for(int i = 0; i < super_arguments.size(); i++) {
                      Object argument = super_arguments.get(i);
                      if(!all_arguments.contains(argument)) {
                           all_arguments.add(argument);
+                     }
+                }
+          }
           return all_arguments;
+     }
      /** Method to retrieve a plugins custom argument information.
+    public ArrayList getArguments() {
+    ArrayList all_arguments = new ArrayList(this);
+    Collections.sort(all_arguments);
+    if(super_plugin != null) {
+        ArrayList super_arguments = super_plugin.getArguments();
+        for(int i = 0; i < super_arguments.size(); i++) {
+        Object argument = super_arguments.get(i);
+        if(!all_arguments.contains(argument)) {
+            all_arguments.add(argument);
+        }
+        }
+    }
+    return all_arguments;
+    }
+    /** Method to retrieve a plugins custom argument information.
       * @return The custom arguments as a <strong>String</strong>.
       */
      public String getCustom() {
           return custom;
+     }
      /** Method to retrieve a plugins name.
+    public String getCustom() {
+    return custom;
+    }
+    /** Method to retrieve a plugins name.
       * @return A <strong>String</strong> containing the plugins name.
       */
      public String getName() {
           return name;
+     }
      public void setCustom(String custom) {
           this.custom = custom;
+     }
      /** Method to set the value of desc.
+    public String getName() {
+    return name;
+    }
+    public void setCustom(String custom) {
+    this.custom = custom;
+    }
+    /** Method to set the value of desc.
       * @param desc The new value of desc as a <strong>String</strong>.
       */
      public void setDesc(String desc) {
           this.desc = desc;
+     }
      /** Method to set the value of name.
+    public void setDesc(String desc) {
+    this.desc = desc;
+    }
+    /** Method to set the value of name.
       * @param name The new value of name as a <strong>String</strong>.
       */
      public void setName(String name) {
           this.name = name;
+     }
      /** Method to set the value of the super_plugin.
+    public void setName(String name) {
+    this.name = name;
+    }
+    /** Method to set the value of the super_plugin.
       * @param super_plugin The new value of super_plugin as a <strong>PlugIn</strong>, or <i>null</i> if this class has no inheritance.
       */
      public void setSuper(PlugIn super_plugin) {
           this.super_plugin = super_plugin;
+     }
      /** Method to print out this plugin as it would appear as a command within the collection configuration file.
+    public void setSuper(PlugIn super_plugin) {
+    this.super_plugin = super_plugin;
+    }
+    /** Method to print out this plugin as it would appear as a command within the collection configuration file.
       * @return A <strong>String</strong> containing a single plugin command.
       */
      public String toString() {
           String text = "plugin " + name + " ";
           ArrayList arguments = getArguments();
           for(int i = 0; i < arguments.size(); i++) {
                 Argument argument = (Argument)arguments.get(i);
                 if(argument.isAssigned()) {
                      text = text + argument.toString();
                      if(i < arguments.size() - 1) {
                           text = text + " ";
+                     }
+                }
+          }
           // Now print custom arguments if any.
           if(custom != null) {
                 text = text + " " + custom;
+          }
           return text;
+     }
+    public String toString() {
+    String text = "plugin " + name + " ";
+    ArrayList arguments = getArguments();
+    for(int i = 0; i < arguments.size(); i++) {
+        Argument argument = (Argument)arguments.get(i);
+        if(argument.isAssigned()) {
+        text = text + argument.toString();
+        if(i < arguments.size() - 1) {
+            text = text + " ";
+        }
+        }
+    }
+    // Now print custom arguments if any.
+    if(custom != null) {
+        text = text + " " + custom;
+    }
+    return text;
+    }
+}

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

-              r4293
+              r4366
 /** This class is resposible for maintaining a list of known plug-ins, and importing new plugins using the parser. */
 public class PlugInManager {
      /** A reference to the main manager for this module. */
      private CollectionDesignManager manager = null;
      /** The controls for editing the contents of this manager. */
      private Control controls = null;
      /** A list of assigned plugins. */
      private DynamicListModel assigned = null;
      /** A list of those plugins that have not yet been assigned. Begins as a copy of reserve. */
      private DynamicListModel available = null;
      /** A list of known, but currently unassigned, plug-ins. */
      private DynamicListModel reserve = null;
      /** A reference to the Gatherer. */
      private Gatherer gatherer = null;
      /** The current index of the separator. */
      private JPanel separator = null;
      /** The default size for a label. */
      static final private Dimension LABEL_SIZE = new Dimension(140, 20);
      /** Constructor.
       */
      public PlugInManager(Gatherer gatherer, CollectionDesignManager manager) {
           this.assigned = new DynamicListModel();
           this.gatherer = gatherer;
           this.manager = manager;
           this.separator = getSeparator();
           // Add the movement separator
           assigned.addElement(separator);
           loadPlugIns();
           savePlugIns();
+     }
      /** Method to add a new plugin to reserve.
+    /** A reference to the main manager for this module. */
+    private CollectionDesignManager manager = null;
+    /** The controls for editing the contents of this manager. */
+    private Control controls = null;
+    /** A list of assigned plugins. */
+    private DynamicListModel assigned = null;
+    /** A list of those plugins that have not yet been assigned. Begins as a copy of reserve. */
+    private DynamicListModel available = null;
+    /** A list of known, but currently unassigned, plug-ins. */
+    private DynamicListModel reserve = null;
+    /** A reference to the Gatherer. */
+    private Gatherer gatherer = null;
+    /** The current index of the separator. */
+    private JPanel separator = null;
+    /** The default size for a label. */
+    static final private Dimension LABEL_SIZE = new Dimension(140, 20);
+    /** Constructor.
+     */
+    public PlugInManager(Gatherer gatherer, CollectionDesignManager manager) {
+    this.assigned = new DynamicListModel();
+    this.gatherer = gatherer;
+    this.manager = manager;
+    this.separator = getSeparator();
+    // Add the movement separator
+    assigned.addElement(separator);
+    loadPlugIns();
+    savePlugIns();
+    }
+    /** Method to add a new plugin to reserve.
       * @param plugin The new <strong>PlugIn</strong>.
       */
      public void addPlugIn(PlugIn plugin) {
           if(!reserve.contains(plugin)) {
                 reserve.addElement(plugin);
                 available.addElement(plugin);
+          }
+     }
      /** Method to assign a plugin.
+    public void addPlugIn(PlugIn plugin) {
+    if(!reserve.contains(plugin)) {
+        reserve.addElement(plugin);
+        available.addElement(plugin);
+    }
+    }
+    /** Method to assign a plugin.
       * @param plugin The reserve <strong>PlugIn</strong> to assign.
       */
      public void assignPlugIn(PlugIn plugin) {
           if(!assigned.contains(plugin)) {
                 if(plugin.getName().equals("RecPlug") || plugin.getName().equals("ArcPlug")) {
                      assigned.addElement(plugin); // Adds after separator
+                }
                 else {
                      int index = assigned.indexOf(separator);
                      assigned.add(index, plugin);
+                }
+    public void assignPlugIn(PlugIn plugin) {
+    if(!assigned.contains(plugin)) {
+        if(plugin.getName().equals("RecPlug") || plugin.getName().equals("ArcPlug")) {
+        assigned.addElement(plugin); // Adds after separator
+        }
+        else {
+        int index = assigned.indexOf(separator);
+        assigned.add(index, plugin);
+        }
                 // Remove from available
                 available.removeElement(plugin);
                 gatherer.c_man.configurationChanged();
+          }
+     }
      /** Method to retrieve the control for this manager.
+        available.removeElement(plugin);
+        gatherer.c_man.configurationChanged();
+    }
+    }
+    /** Method to retrieve the control for this manager.
       * @return A <strong>JPanel</strong> containing the controls.
       */
      public JPanel getControls() {
           if(controls == null) {
                 controls = new Control();
+          }
           return controls;
+     }
      /** Method to retrieve the named plugin.
+    public JPanel getControls() {
+    if(controls == null) {
+        controls = new Control();
+    }
+    return controls;
+    }
+    /** Method to retrieve the named plugin.
       * @param name The name of the desired plugin as a <strong>String</strong>.
       * @return The requested <strong>PlugIn</strong> or <i>null</i> if no such plugin exists.
       */
      public PlugIn getPlugIn(String name) {
           for(int i = 0; i < reserve.size(); i++) {
                 Object object = reserve.get(i);
                 if(object instanceof PlugIn) {
                      PlugIn plugin = (PlugIn) object;
                      if(plugin.getName().equals(name)) {
                           return plugin;
+                     }
+                }
+          }
           // No success.
           return null;
+     }
      /** Method to invalidate controls after a significant change in the system state.
       */
      public void invalidateControls() {
           if(controls != null) {
                 controls.destroy();
+          }
           controls = null;
+     }
      /** Method to load the details of a single plug-in.
+    public PlugIn getPlugIn(String name) {
+    for(int i = 0; i < reserve.size(); i++) {
+        Object object = reserve.get(i);
+        if(object instanceof PlugIn) {
+        PlugIn plugin = (PlugIn) object;
+        if(plugin.getName().equals(name)) {
+            return plugin;
+        }
+        }
+    }
+    // No success.
+    return null;
+    }
+    /** Method to invalidate controls after a significant change in the system state.
+      */
+    public void invalidateControls() {
+    if(controls != null) {
+        controls.destroy();
+    }
+    controls = null;
+    }
+    /** Method to load the details of a single plug-in.
       * @param plugin The plugin <strong>File</strong> you wish to load.
       */
      public void loadPlugIn(File plugin) {
           Document document = null;
           // Run pluginfo on this plugin, and then send the results for parsing.
           try {
                 String args[] = null;
                 if(Utility.isWindows()) {
                      args = new String[4];
                      if(gatherer.config.perl_path != null) {
                           args[0] = gatherer.config.perl_path + "Perl.exe";
+                     }
                      else {
                           args[0] = "Perl.exe";
+                     }
                      args[1] = gatherer.config.gsdl_path + "bin" + File.separator + "script" + File.separator + "pluginfo.pl";
                      args[2] = "-xml";
                      args[3] = getPlugInName(plugin);
+                }
                 else {
                      args = new String[3];
                      args[0] = "pluginfo.pl";
                      args[1] = "-xml";
                      args[2] = getPlugInName(plugin);
+                }
                 for(int i = 0; i < args.length; i++) {
                     ///ystem.out.print(args[i] + " ");
+                }
+    public void loadPlugIn(File plugin) {
+    Document document = null;
+    // Run pluginfo on this plugin, and then send the results for parsing.
+    try {
+        String args[] = null;
+        if(Utility.isWindows()) {
+        args = new String[4];
+        if(gatherer.config.perl_path != null) {
+            args[0] = gatherer.config.perl_path + "Perl.exe";
+        }
+        else {
+            args[0] = "Perl.exe";
+        }
+        args[1] = gatherer.config.gsdl_path + "bin" + File.separator + "script" + File.separator + "pluginfo.pl";
+        args[2] = "-xml";
+        args[3] = getPlugInName(plugin);
+        }
+        else {
+        args = new String[3];
+        args[0] = "pluginfo.pl";
+        args[1] = "-xml";
+        args[2] = getPlugInName(plugin);
+        }
+        for(int i = 0; i < args.length; i++) {
+        ///ystem.out.print(args[i] + " ");
+        }
                 ///ystem.out.print("\n");
                 // Create the process.
                 Runtime runtime = Runtime.getRuntime();
                 Process process = runtime.exec(args);
+        Runtime runtime = Runtime.getRuntime();
+        Process process = runtime.exec(args);
                 //InputStream input_stream = process.getErrorStream();
                 BufferedReader error_in = new BufferedReader(new InputStreamReader(process.getErrorStream()));
                 String line = "";
                 StringBuffer xml = new StringBuffer("");
                 while((line = error_in.readLine()) != null) {
                     xml.append(line);
                     xml.append("\n");
+                }
                 line = null;
                 error_in = null;
+        BufferedReader error_in = new BufferedReader(new InputStreamReader(process.getErrorStream()));
+        String line = "";
+        StringBuffer xml = new StringBuffer("");
+        while((line = error_in.readLine()) != null) {
+        xml.append(line);
+        xml.append("\n");
+        }
+        line = null;
+        error_in = null;
                 ///ystem.out.println("\n");
                 // Then read the xml from the piped input stream.
                 InputSource source = new InputSource(new StringReader(xml.toString()));
                 DOMParser parser = new DOMParser();
                 parser.parse(source);
                 document = parser.getDocument();
+          }
           catch (Exception error) {
                 error.printStackTrace();
+          }
           if(document != null) {
                 parse(document.getDocumentElement());
+          }
+     }
      /** Method to move a plugin higher in the list order.
+        InputSource source = new InputSource(new StringReader(xml.toString()));
+        DOMParser parser = new DOMParser();
+        parser.parse(source);
+        document = parser.getDocument();
+    }
+    catch (Exception error) {
+        error.printStackTrace();
+    }
+    if(document != null) {
+        parse(document.getDocumentElement());
+    }
+    }
+    /** Method to move a plugin higher in the list order.
       * @param plugin The <strong>PlugIn</strong> you want to move.
       * @param direction <i>true</i> to move the plugin up, <i>false</i> to move it down.
       * @param all <i>true</i> to move to move all the way, <i>false</i> for a single step.
       */
+     public void movePlugIn(PlugIn plugin, boolean direction, boolean all) {
+          // Can't ever move RecPlug or ArcPlug.
+          if(plugin.getName().equals("ArcPlug") || plugin.getName().equals("RecPlug")) {
+                JOptionPane.showMessageDialog(manager.gui, get("CDM.Move.Fixed"), get("CDM.Move.Title"), JOptionPane.ERROR_MESSAGE);
+                return;
+          }
+          if(all) {
+                if(direction) {
+                     assigned.removeElement(plugin);
+                     assigned.add(0, plugin);
+                     gatherer.c_man.configurationChanged();
+    public void movePlugIn(PlugIn plugin, boolean direction, boolean all) {
+    // Can't ever move RecPlug or ArcPlug.
+    if(plugin.getName().equals("ArcPlug") || plugin.getName().equals("RecPlug")) {
+        JOptionPane.showMessageDialog(manager.gui, get("CDM.Move.Fixed"), get("CDM.Move.Title"), JOptionPane.ERROR_MESSAGE);
+        return;
+    }
+    if(all) {
+        if(direction) {
+        assigned.removeElement(plugin);
+        assigned.add(0, plugin);
+        gatherer.c_man.configurationChanged();
+        }
+        else {
+        assigned.removeElement(plugin);
+        int index = assigned.size() - 1;
+        boolean found = false;
+        while(!found) {
+            Object temp = assigned.get(index);
+            if(temp instanceof PlugIn) {
+            PlugIn current = (PlugIn) temp;
+            if(current.getName().equals("ArcPlug") || current.getName().equals("RecPlug")) {
+                index--;
+            }
+            else {
+                found = true;
+            }
+            }
+            else {
+            found = true;
+            }
+        }
+        assigned.add(index, plugin);
+        gatherer.c_man.configurationChanged();
+        }
+    }
+    else {
+                // Try to move the plugin one step in the desired direction.
+        int index = assigned.indexOf(plugin);
+                ///ystem.err.println("Index of " + plugin + " = " + index);
+        if(direction) {
+        index--;
+        if(index < 0) {
+            String args[] = new String[1];
+            args[0] = plugin.getName();
+            JOptionPane.showMessageDialog(manager.gui, get("CDM.Move.At_Top", args), get("CDM.Move.Title"), JOptionPane.ERROR_MESSAGE);
+            return;
+        }
+        assigned.removeElement(plugin);
+        assigned.add(index, plugin);
+        gatherer.c_man.configurationChanged();
+        }
+        else {
+        index++;
+        Object object = assigned.get(index);
+        if(index == assigned.size()) {
+            String args[] = new String[1];
+            args[0] = plugin.getName();
+            JOptionPane.showMessageDialog(manager.gui, get("CDM.Move.At_Bottom", args), get("CDM.Move.Title"), JOptionPane.ERROR_MESSAGE);
+            // Still not going to move RecPlug or ArcPlug.
+            return;
+        }
+        else if(!(object instanceof PlugIn) || ((PlugIn)object).getName().equals("ArcPlug") || ((PlugIn)object).getName().equals("RecPlug")) {
+            String args[] = new String[1];
+            args[0] = plugin.getName();
+            JOptionPane.showMessageDialog(manager.gui, get("CDM.Move.Cannot", args), get("CDM.Move.Title"), JOptionPane.ERROR_MESSAGE);
+            // Still not going to move RecPlug or ArcPlug.
+            return;
+        }
+        assigned.removeElement(plugin);
+        assigned.add(index, plugin);
+        gatherer.c_man.configurationChanged();
+        }
+    }
+    }
+    /** This method attempts to parse a plugin command from a command string taken from the collection configuration file. This process is quite complex as not only must the correct plugin be matched by also all of the parameters given must be legal. If such a command is found, the plugin is immediately assigned.
+      * @param command The coomand <strong>String</strong> that may include plugin information.
+      * @return <i>true</i> if a plugin command was parsed, <i>false</i> otherwise.
+      */
+    public boolean parse(String command) {
+    String command_lc = command.toLowerCase();
+    if(command_lc.startsWith("plugin")) {
+        CommandTokenizer tokenizer = new CommandTokenizer(command);
+        if(tokenizer.countTokens() >= 2) {
+        tokenizer.nextToken(); // Throw away 'plugin'
+        String name = tokenizer.nextToken();
+        // Try to locate the plugin with this name.
+        PlugIn plugin = getPlugIn(name);
+        // And if successful start to parse the arguments.
+        if(plugin != null) {
+            // Take a copy.
+            plugin = plugin.copy();
+            String key = null;
+            while(tokenizer.hasMoreTokens()) {
+            if(key == null) {
+                key = tokenizer.nextToken();
+            }
+            // Try to retrieve a matching argument.
+            Argument argument = plugin.getArgument(key);
+            if(argument != null) {
+                // Set as assigned.
+                argument.setAssigned(true);
+                // And if the argument is of a parameter type, parse a parameter.
+                if(argument.getType() != Argument.FLAG && tokenizer.hasMoreTokens()) {
+                argument.setValue(tokenizer.nextToken());
+                }
+                key = null;
+            }
+            // Argument cannot be matched.
+            else {
+                String cur_key = key;
+                String value = tokenizer.nextToken();
+                if(value.startsWith("-")) {
+                key = value;
+                value = null;
+                }
+                else {
+                key = null;
+                }
+                String custom = plugin.getCustom();
+                if(custom == null) {
+                if(value == null) {
+                    plugin.setCustom(cur_key);
+                }
                 else {
+                     assigned.removeElement(plugin);
+                     int index = assigned.size() - 1;
+                     boolean found = false;
+                     while(!found) {
+                          Object temp = assigned.get(index);
+                          if(temp instanceof PlugIn) {
+                                PlugIn current = (PlugIn) temp;
+                                if(current.getName().equals("ArcPlug") || current.getName().equals("RecPlug")) {
+                                     index--;
+                                }
+                                else {
+                                     found = true;
+                                }
+                          }
+                          else {
+                                found = true;
+                          }
+                     }
+                     assigned.add(index, plugin);
+                     gatherer.c_man.configurationChanged();
+                    plugin.setCustom(cur_key + " " + value);
+                }
+          }
+          else {
+                // Try to move the plugin one step in the desired direction.
+                int index = assigned.indexOf(plugin);
+                ///ystem.err.println("Index of " + plugin + " = " + index);
+                if(direction) {
+                     index--;
+                     if(index < 0) {
+                          String args[] = new String[1];
+                          args[0] = plugin.getName();
+                          JOptionPane.showMessageDialog(manager.gui, get("CDM.Move.At_Top", args), get("CDM.Move.Title"), JOptionPane.ERROR_MESSAGE);
+                          return;
+                     }
+                     assigned.removeElement(plugin);
+                     assigned.add(index, plugin);
+                     gatherer.c_man.configurationChanged();
+                }
+                else {
+                if(value == null) {
+                    plugin.setCustom(custom + " " + cur_key);
+                }
                 else {
+                     index++;
+                     Object object = assigned.get(index);
+                     if(index == assigned.size()) {
+                          String args[] = new String[1];
+                          args[0] = plugin.getName();
+                          JOptionPane.showMessageDialog(manager.gui, get("CDM.Move.At_Bottom", args), get("CDM.Move.Title"), JOptionPane.ERROR_MESSAGE);
+                          // Still not going to move RecPlug or ArcPlug.
+                          return;
+                     }
+                     else if(!(object instanceof PlugIn) || ((PlugIn)object).getName().equals("ArcPlug") || ((PlugIn)object).getName().equals("RecPlug")) {
+                          String args[] = new String[1];
+                          args[0] = plugin.getName();
+                          JOptionPane.showMessageDialog(manager.gui, get("CDM.Move.Cannot", args), get("CDM.Move.Title"), JOptionPane.ERROR_MESSAGE);
+                          // Still not going to move RecPlug or ArcPlug.
+                          return;
+                     }
+                     assigned.removeElement(plugin);
+                     assigned.add(index, plugin);
+                     gatherer.c_man.configurationChanged();
+                    plugin.setCustom(custom + " " + cur_key + " " + value);
+                }
+          }
+     }
+     /** This method attempts to parse a plugin command from a command string taken from the collection configuration file. This process is quite complex as not only must the correct plugin be matched by also all of the parameters given must be legal. If such a command is found, the plugin is immediately assigned.
+      * @param command The coomand <strong>String</strong> that may include plugin information.
+      * @return <i>true</i> if a plugin command was parsed, <i>false</i> otherwise.
+      */
+     public boolean parse(String command) {
+          String command_lc = command.toLowerCase();
+          if(command_lc.startsWith("plugin")) {
+                CommandTokenizer tokenizer = new CommandTokenizer(command);
+                if(tokenizer.countTokens() >= 2) {
+                     tokenizer.nextToken(); // Throw away 'plugin'
+                     String name = tokenizer.nextToken();
+                     // Try to locate the plugin with this name.
+                     PlugIn plugin = getPlugIn(name);
+                     // And if successful start to parse the arguments.
+                     if(plugin != null) {
+                          // Take a copy.
+                          plugin = plugin.copy();
+                          String key = null;
+                          while(tokenizer.hasMoreTokens()) {
+                                if(key == null) {
+                                     key = tokenizer.nextToken();
+                                }
+                                // Try to retrieve a matching argument.
+                                Argument argument = plugin.getArgument(key);
+                                if(argument != null) {
+                                     // Set as assigned.
+                                     argument.setAssigned(true);
+                                     // And if the argument is of a parameter type, parse a parameter.
+                                     if(argument.getType() != Argument.FLAG && tokenizer.hasMoreTokens()) {
+                                          argument.setValue(tokenizer.nextToken());
+                                     }
+                                     key = null;
+                                }
+                                // Argument cannot be matched.
+                                else {
+                                     String cur_key = key;
+                                     String value = tokenizer.nextToken();
+                                     if(value.startsWith("-")) {
+                                          key = value;
+                                          value = null;
+                                     }
+                                     else {
+                                          key = null;
+                                     }
+                                     String custom = plugin.getCustom();
+                                     if(custom == null) {
+                                          if(value == null) {
+                                                plugin.setCustom(cur_key);
+                                          }
+                                          else {
+                                                plugin.setCustom(cur_key + " " + value);
+                                          }
+                                     }
+                                     else {
+                                          if(value == null) {
+                                                plugin.setCustom(custom + " " + cur_key);
+                                          }
+                                          else {
+                                                plugin.setCustom(custom + " " + cur_key + " " + value);
+                                          }
+                                     }
+                                }
+                          }
+                          // Slight tweak. If the plugin is the RecPlug we want to set use_metadata_files by default.
+                          if(plugin.getName().equalsIgnoreCase("RecPlug")) {
+                                Argument argument = plugin.getArgument("-use_metadata_files");
+                                if(argument != null) {
+                                     argument.setAssigned(true);
+                                }
+                          }
+                          // Second tweak. If the plugin is the HTMLPlug we want to modify the block expression so our backup files are ignored.
+                          if(plugin.getName().equalsIgnoreCase("HTMLPlug")) {
+                                Argument argument = plugin.getArgument("-block_exp");
+                                if(argument != null) {
+                                     argument.setValue(argument.getDefaultValue() + "|(~$)");
+                                }
+                          }
+                          // Add the plugin to our reserve
+                          assignPlugIn(plugin);
+                          return true;
+                     }
+                     else {
+                          //ystem.err.println("Unknown plugin");
+                     }
+                }
+          }
+          return false;
+     }
+     /** This method removes an assigned plugin. I was tempted to call it unassign, by remove is more consistant. Note that there is no way to remove a plugin from the reserve.
+                }
+            }
+            }
+            // Slight tweak. If the plugin is the RecPlug we want to set use_metadata_files by default.
+            if(plugin.getName().equalsIgnoreCase("RecPlug")) {
+            Argument argument = plugin.getArgument("-use_metadata_files");
+            if(argument != null) {
+                argument.setAssigned(true);
+            }
+            }
+            // Second tweak. If the plugin is the HTMLPlug we want to modify the block expression so our backup files are ignored.
+            if(plugin.getName().equalsIgnoreCase("HTMLPlug")) {
+            Argument argument = plugin.getArgument("-block_exp");
+            if(argument != null) {
+                argument.setValue(argument.getDefaultValue() + "|(~$)");
+            }
+            }
+            // Add the plugin to our reserve
+            assignPlugIn(plugin);
+            return true;
+        }
+        else {
+            //ystem.err.println("Unknown plugin");
+        }
+        }
+    }
+    return false;
+    }
+    /** This method removes an assigned plugin. I was tempted to call it unassign, by remove is more consistant. Note that there is no way to remove a plugin from the reserve.
       * @param plugin The <strong>PlugIn</strong> to remove.
       */
      public void removePlugIn(PlugIn plugin) {
           assigned.removeElement(plugin);
           available.addElement(plugin);
           gatherer.c_man.configurationChanged();
+     }
      /** Method to cache the current contents of reserve (known plugins) to file.
       */
      public void savePlugIns() {
           try {
                 FileOutputStream file = new FileOutputStream(Utility.BASE_DIR + "plugins.dat");
                 ObjectOutputStream out = new ObjectOutputStream(file);
                 out.writeObject(reserve);
                 out.close();
+          }
           catch (Exception error) {
+          }
+     }
      /** Method used to determine the number of plugins that have been assigned.
+    public void removePlugIn(PlugIn plugin) {
+    assigned.removeElement(plugin);
+    available.addElement(plugin);
+    gatherer.c_man.configurationChanged();
+    }
+    /** Method to cache the current contents of reserve (known plugins) to file.
+      */
+    public void savePlugIns() {
+    try {
+        FileOutputStream file = new FileOutputStream(Utility.BASE_DIR + "plugins.dat");
+        ObjectOutputStream out = new ObjectOutputStream(file);
+        out.writeObject(reserve);
+        out.close();
+    }
+    catch (Exception error) {
+    }
+    }
+    /** Method used to determine the number of plugins that have been assigned.
       * @return An <i>int</i> which is the number of plugins.
       */
      public int size() {
           return assigned.size();
+     }
      /** Method to print out a block of plugin commands, much like you'd find in a collection configuration file.
+    public int size() {
+    return assigned.size();
+    }
+    /** Method to print out a block of plugin commands, much like you'd find in a collection configuration file.
       * @return A <strong>String</strong> containing a series of plugin commands separated by new lines.
       */
      public String toString() {
           String text = "";
           for(int i = 0; i < assigned.size(); i++) {
                 Object object = assigned.get(i);
                 if(object instanceof PlugIn) {
                      PlugIn plugin = (PlugIn) object;
                      text = text + plugin.toString() + "\n";
+                }
+          }
           text = text + "\n";
           return text;
+     }
      /* Retrieve a phrase from the dictionary based on a certain key.
+    public String toString() {
+    String text = "";
+    for(int i = 0; i < assigned.size(); i++) {
+        Object object = assigned.get(i);
+        if(object instanceof PlugIn) {
+        PlugIn plugin = (PlugIn) object;
+        text = text + plugin.toString() + "\n";
+        }
+    }
+    text = text + "\n";
+    return text;
+    }
+    /* Retrieve a phrase from the dictionary based on a certain key.
       * @param key The search <strong>String</strong>.
       * @return The matching phrase from the Dictionary.
       */
      private String get(String key) {
           return get(key, null);
+     }
      /* Retrieve a phrase from the dictionary based on a certain key and arguments.
+    private String get(String key) {
+    return get(key, null);
+    }
+    /* Retrieve a phrase from the dictionary based on a certain key and arguments.
       * @param key The search <strong>String</strong>.
       * @param args A <strong>String[]</strong> of arguments used to complete and format the choosen phrase.
       * @return The matching phrase from the Dictionary.
       */
      private String get(String key, String args[]) {
           if(key.indexOf(".") == -1) {
                 key = "CDM.PlugInManager." + key;
+          }
           return gatherer.dictionary.get(key, args);
+     }
      /** Method to extract just the plugins name from a file object.
+    private String get(String key, String args[]) {
+    if(key.indexOf(".") == -1) {
+        key = "CDM.PlugInManager." + key;
+    }
+    return gatherer.dictionary.get(key, args);
+    }
+    /** Method to extract just the plugins name from a file object.
       * @param plugin The <strong>File</strong> which references a certain plugin.
       * @return A <strong>String</strong> containing just the plugins name, without extension.
       */
      private String getPlugInName(File plugin) {
           String name = plugin.getName();
           if(name.indexOf(".") != -1) {
                 name = name.substring(0, name.indexOf("."));
+          }
           return name;
+     }
      /** Method to retrieve the CData value from a node. Requires a search for the #text node.
+    private String getPlugInName(File plugin) {
+    String name = plugin.getName();
+    if(name.indexOf(".") != -1) {
+        name = name.substring(0, name.indexOf("."));
+    }
+    return name;
+    }
+    /** Method to retrieve the CData value from a node. Requires a search for the #text node.
       * @param node The <strong>Node</strong> whose value we wish to find.
       * @return The value of node as a <strong>String</strong>, or <i>null</i> if no value exists.
       */
      private String getValue(Node node) {
           if(node.hasChildNodes()) {
                 Node text = node.getFirstChild();
+    private String getValue(Node node) {
+    if(node.hasChildNodes()) {
+        Node text = node.getFirstChild();
                 //ystem.err.println("Value of " + node.getNodeName() + " = " + text.getNodeValue());
                 return text.getNodeValue();
+          }
           return node.getNodeValue();
+     }
      /** Method to initially load information from the standard plug-ins within the gsdl Perl library.
       */
      private void loadPlugIns() {
           // Attempt to restore the cached file.
           try {
                 FileInputStream file = new FileInputStream(Utility.BASE_DIR + "plugins.dat");
                 ObjectInputStream input = new ObjectInputStream(file);
                 reserve = (DynamicListModel) input.readObject();
                 available = reserve.shallowCopy();
+          }
           catch (Exception error) {
+          }
           if(reserve == null) {
                 available = new DynamicListModel();
                 reserve = new DynamicListModel();
                 reserve.setAutoOrder(true);
+        return text.getNodeValue();
+    }
+    return node.getNodeValue();
+    }
+    /** Method to initially load information from the standard plug-ins within the gsdl Perl library.
+      */
+    private void loadPlugIns() {
+    // Attempt to restore the cached file.
+    try {
+        FileInputStream file = new FileInputStream(Utility.BASE_DIR + "plugins.dat");
+        ObjectInputStream input = new ObjectInputStream(file);
+        reserve = (DynamicListModel) input.readObject();
+        available = reserve.shallowCopy();
+    }
+    catch (Exception error) {
+    }
+    if(reserve == null) {
+        available = new DynamicListModel();
+        reserve = new DynamicListModel();
+        reserve.setAutoOrder(true);
                 // Retrieve the gsdl home directory...
                 String directory = gatherer.config.gsdl_path;
                 directory = directory + "perllib" + File.separator + "plugins" + File.separator;
                 loadPlugIns(new File(directory));
+          }
+     }
      /** Method to load plug-in information from a specified directory. Of course no plug-ins may be found at this location.
+        String directory = gatherer.config.gsdl_path;
+        directory = directory + "perllib" + File.separator + "plugins" + File.separator;
+        loadPlugIns(new File(directory));
+    }
+    }
+    /** Method to load plug-in information from a specified directory. Of course no plug-ins may be found at this location.
       * @param directory A <strong>File</strong> indicating the directory to be scanned for plug-ins.
       */
      private void loadPlugIns(File directory) {
           File files[] = directory.listFiles();
           if(files != null) {
+    private void loadPlugIns(File directory) {
+    File files[] = directory.listFiles();
+    if(files != null) {
                 // Create a progress indicator.
+                ParsingProgress progress = new ParsingProgress(get("CDM.PlugInManager.Parsing.Title"), get("CDM.PlugInManager.Parsing.Message"), files.length);
+                for(int i = 0; i < files.length; i++) {
+                     // We only want to check Perl Modules.
+                     if(files[i].getName().endsWith(".pm")) {
+                          loadPlugIn(files[i]);
+                     }
+                     progress.inc();
+        ParsingProgress progress = new ParsingProgress(get("CDM.PlugInManager.Parsing.Title"), get("CDM.PlugInManager.Parsing.Message"), files.length);
+        for(int i = 0; i < files.length; i++) {
+        // We only want to check Perl Modules.
+        if(files[i].getName().endsWith(".pm")) {
+            loadPlugIn(files[i]);
+        }
+        progress.inc();
+        }
+        progress.dispose();
+    }
+    }
+    private PlugIn parse(Node root) {
+    PlugIn plugin = new PlugIn();
+    String node_name = null;
+    for(Node node = root.getFirstChild(); node != null;
+        node = node.getNextSibling()) {
+        node_name = node.getNodeName();
+        if(node_name.equals("Name")) {
+        String name = getValue(node);
+        // We can save ourselves some processing time if a plugin with this name already exists in our manager. If so retrieve it and return it.
+        PlugIn existing = getPlugIn(name);
+        if(existing != null) {
+            return existing;
+        }
+        plugin.setName(name);
+        }
+        else if(node_name.equals("Desc")) {
+        plugin.setDesc(getValue(node));
+        }
+                // Parse the multitude of arguments.
+        else if(node_name.equals("Arguments")) {
+        for(Node arg = node.getFirstChild(); arg != null; arg = arg.getNextSibling()) {
+            node_name = arg.getNodeName();
+            // An option.
+            if(node_name.equals("Option")) {
+            Argument argument = new Argument();
+            // If its an option we parse the multitude of details an options might have.
+            for(Node det = arg.getFirstChild(); det != null; det = det.getNextSibling()) {
+                node_name = det.getNodeName();
+                if(node_name.equals("Name")) {
+                argument.setName(getValue(det));
+                }
+                else if(node_name.equals("Desc")) {
+                argument.setDesc(getValue(det));
+                }
+                else if(node_name.equals("Type")) {
+                argument.setType(getValue(det));
+                }
+                else if(node_name.equals("Default")) {
+                argument.setDefault(getValue(det));
+                }
+                else if(node_name.equals("List")) {
+                // Two final loops are required to parse lists.
+                for(Node value = det.getFirstChild(); value != null; value = value.getNextSibling()) {
+                    if(value.getNodeName().equals("Value")) {
+                    String key = null;
+                    String desc = "";
+                    for(Node subvalue = value.getFirstChild(); subvalue != null; subvalue = subvalue.getNextSibling()) {
+                        node_name = subvalue.getNodeName();
+                        if(node_name.equals("Name")) {
+                        key = getValue(subvalue);
+                        }
+                        else if(node_name.equals("Desc")) {
+                        desc = getValue(subvalue);
+                        }
+                    }
+                    if(key != null) {
+                        argument.addOption(key, desc);
+                    }
+                    }
+                }
+                progress.dispose();
+          }
+     }
+     private PlugIn parse(Node root) {
+          PlugIn plugin = new PlugIn();
+          String node_name = null;
+          for(Node node = root.getFirstChild(); node != null;
+                node = node.getNextSibling()) {
+                node_name = node.getNodeName();
+                if(node_name.equals("Name")) {
+                     String name = getValue(node);
+                     // We can save ourselves some processing time if a plugin with this name already exists in our manager. If so retrieve it and return it.
+                     PlugIn existing = getPlugIn(name);
+                     if(existing != null) {
+                          return existing;
+                     }
+                     plugin.setName(name);
+                }
+                else if(node_name.equals("Required")) {
+                String v = getValue(det);
+                if(v != null && v.equals("yes")) {
+                    argument.setRequired(true);
+                }
+                else if(node_name.equals("Desc")) {
+                     plugin.setDesc(getValue(node));
+                }
+                // Parse the multitude of arguments.
+                else if(node_name.equals("Arguments")) {
+                     for(Node arg = node.getFirstChild(); arg != null; arg = arg.getNextSibling()) {
+                          node_name = arg.getNodeName();
+                          // An option.
+                          if(node_name.equals("Option")) {
+                                Argument argument = new Argument();
+                                // If its an option we parse the multitude of details an options might have.
+                                for(Node det = arg.getFirstChild(); det != null; det = det.getNextSibling()) {
+                                     node_name = det.getNodeName();
+                                     if(node_name.equals("Name")) {
+                                          argument.setName(getValue(det));
+                                     }
+                                     else if(node_name.equals("Desc")) {
+                                          argument.setDesc(getValue(det));
+                                     }
+                                     else if(node_name.equals("Type")) {
+                                          argument.setType(getValue(det));
+                                     }
+                                     else if(node_name.equals("Default")) {
+                                          argument.setDefault(getValue(det));
+                                     }
+                                     else if(node_name.equals("List")) {
+                                          // Two final loops are required to parse lists.
+                                          for(Node value = det.getFirstChild(); value != null; value = value.getNextSibling()) {
+                                                if(value.getNodeName().equals("Value")) {
+                                                     String key = null;
+                                                     String desc = "";
+                                                     for(Node subvalue = value.getFirstChild(); subvalue != null; subvalue = subvalue.getNextSibling()) {
+                                                          node_name = subvalue.getNodeName();
+                                                          if(node_name.equals("Name")) {
+                                                                key = getValue(subvalue);
+                                                          }
+                                                          else if(node_name.equals("Desc")) {
+                                                                desc = getValue(subvalue);
+                                                          }
+                                                     }
+                                                     if(key != null) {
+                                                          argument.addOption(key, desc);
+                                                     }
+                                                }
+                                          }
+                                     }
+                                     else if(node_name.equals("Required")) {
+                                          String v = getValue(det);
+                                          if(v != null && v.equals("yes")) {
+                                                argument.setRequired(true);
+                                          }
+                                     }
+                                }
+                                plugin.addArgument(argument);
+                          }
+                          // A super plugin class.
+                          else if(node_name.equals("PlugInfo")) {
+                                PlugIn super_plugin = parse(arg);
+                                plugin.setSuper(super_plugin);
+                          }
+                     }
+                }
+          }
+          if(plugin.getName() != null) {
+                addPlugIn(plugin);
+                return plugin;
+          }
+          return null;
+     }
+     /** A class which provodes controls for assigned and editing plugins. */
+     private class Control
+          extends JPanel {
+          /** Button for adding plugins. */
+          private JButton add = null;
+          /** Button for configuring the selected plugin. */
+          private JButton configure = null;
+          /** Buttom to move an assinged plugin as low in the order as possible. */
+          private JButton move_bottom = null;
+          /** Button to move an assigned plugin one position lower in the order. */
+          private JButton move_down = null;
+          /** Button to move an assigned plugin as high in the order as possible. */
+          private JButton move_top = null;
+          /** Button to move an assigned plugin one position higher in the order. */
+          private JButton move_up = null;
+          /** Button to remove the selected plugin. */
+          private JButton remove = null;
+          /** A combobox containing all of the known plugins, including those that may have already been assigned. */
+          private JComboBox plugin = null;
+          /** The label next to the plugin combobox. */
+          private JLabel plugin_label = null;
+          /** The label above the assigned plugin list. */
+          private JLabel plugin_list_label = null;
+          /** The title of this view. */
+          private JLabel title = null;
+          /** A list of assigned plugins. */
+          private JList plugin_list = null;
+          /** The area where the add, configure and remove buttons are placed. */
+          private JPanel button_pane = null;
+          /** The region which divides the central portion of the view into list and controls. */
+          private JPanel central_pane = null;
+          /** The area where title label and instructions sit. */
+          private JPanel header_pane = null;
+          /** The area where movement buttons are placed. */
+          private JPanel movement_pane = null;
+          /** The small region containing the plugin combobox and its label. */
+          private JPanel plugin_pane = null;
+          /** The pane containing the assigned plugin list and its label. */
+          private JPanel plugin_list_pane = null;
+          /** The text area containing instructions on the use of this control. */
+          private JTextArea instructions = null;
+          /** Constructor.
+                }
+            }
+            plugin.addArgument(argument);
+            }
+            // A super plugin class.
+            else if(node_name.equals("PlugInfo")) {
+            PlugIn super_plugin = parse(arg);
+            plugin.setSuper(super_plugin);
+            }
+        }
+        }
+    }
+    if(plugin.getName() != null) {
+        addPlugIn(plugin);
+        return plugin;
+    }
+    return null;
+    }
+    /** A class which provodes controls for assigned and editing plugins. */
+    private class Control
+    extends JPanel {
+    /** Button for adding plugins. */
+    private JButton add = null;
+    /** Button for configuring the selected plugin. */
+    private JButton configure = null;
+    /** Buttom to move an assinged plugin as low in the order as possible. */
+    private JButton move_bottom = null;
+    /** Button to move an assigned plugin one position lower in the order. */
+    private JButton move_down = null;
+    /** Button to move an assigned plugin as high in the order as possible. */
+    private JButton move_top = null;
+    /** Button to move an assigned plugin one position higher in the order. */
+    private JButton move_up = null;
+    /** Button to remove the selected plugin. */
+    private JButton remove = null;
+    /** A combobox containing all of the known plugins, including those that may have already been assigned. */
+    private JComboBox plugin = null;
+    /** The label next to the plugin combobox. */
+    private JLabel plugin_label = null;
+    /** The label above the assigned plugin list. */
+    private JLabel plugin_list_label = null;
+    /** The title of this view. */
+    private JLabel title = null;
+    /** A list of assigned plugins. */
+    private JList plugin_list = null;
+    /** The area where the add, configure and remove buttons are placed. */
+    private JPanel button_pane = null;
+    /** The region which divides the central portion of the view into list and controls. */
+    private JPanel central_pane = null;
+    /** The area where title label and instructions sit. */
+    private JPanel header_pane = null;
+    /** The area where movement buttons are placed. */
+    private JPanel movement_pane = null;
+    /** The small region containing the plugin combobox and its label. */
+    private JPanel plugin_pane = null;
+    /** The pane containing the assigned plugin list and its label. */
+    private JPanel plugin_list_pane = null;
+    /** The text area containing instructions on the use of this control. */
+    private JTextArea instructions = null;
+    /** Constructor.
+     */
+    public Control() {
+        Object plugins[] = reserve.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"));
+        add.setMnemonic(KeyEvent.VK_A);
+        button_pane = new JPanel();
+        central_pane = new JPanel();
+        configure = new JButton(get("Configure"));
+        configure.setMnemonic(KeyEvent.VK_C);
+        header_pane = new JPanel();
+        instructions = new JTextArea(get("Instructions"));
+        instructions.setBackground(Gatherer.config.getColor("coloring.collection_tree_background", false));
+        instructions.setEditable(false);
+        instructions.setLineWrap(true);
+        instructions.setRows(5);
+        instructions.setWrapStyleWord(true);
+        move_bottom = new JButton();
+        JLabel move_bottom_label = new JLabel(get("Move_Bottom"));
+        move_bottom_label.setHorizontalAlignment(JLabel.CENTER);
+        move_bottom_label.setPreferredSize(LABEL_SIZE);
+        move_bottom.setLayout(new BorderLayout());
+        move_bottom.add(new JLabel(Utility.getImage("arrow-bottom.gif")), BorderLayout.WEST);
+        move_bottom.add(move_bottom_label, BorderLayout.CENTER);
+        move_bottom.add(new JLabel(Utility.getImage("arrow-bottom.gif")), BorderLayout.EAST);
+        move_bottom.setMnemonic(KeyEvent.VK_B);
+        move_down = new JButton();
+        JLabel move_down_label = new JLabel(get("Move_Down"));
+        move_down_label.setHorizontalAlignment(JLabel.CENTER);
+        move_down_label.setPreferredSize(LABEL_SIZE);
+        move_down.setLayout(new BorderLayout());
+        move_down.add(new JLabel(Utility.getImage("arrow-down.gif")), BorderLayout.WEST);
+        move_down.add(move_down_label, BorderLayout.CENTER);
+        move_down.add(new JLabel(Utility.getImage("arrow-down.gif")), BorderLayout.EAST);
+        move_down.setMnemonic(KeyEvent.VK_D);
+        move_top = new JButton();
+        JLabel move_top_label = new JLabel(get("Move_Top"));
+        move_top_label.setHorizontalAlignment(JLabel.CENTER);
+        move_top_label.setPreferredSize(LABEL_SIZE);
+        move_top.setLayout(new BorderLayout());
+        move_top.add(new JLabel(Utility.getImage("arrow-top.gif")), BorderLayout.WEST);
+        move_top.add(move_top_label, BorderLayout.CENTER);
+        move_top.add(new JLabel(Utility.getImage("arrow-top.gif")), BorderLayout.EAST);
+        move_top.setMnemonic(KeyEvent.VK_T);
+        move_up = new JButton();
+        JLabel move_up_label = new JLabel(get("Move_Up"));
+        move_up_label.setHorizontalAlignment(JLabel.CENTER);
+        move_up_label.setPreferredSize(LABEL_SIZE);
+        move_up.setLayout(new BorderLayout());
+        move_up.add(new JLabel(Utility.getImage("arrow-up.gif")), BorderLayout.WEST);
+        move_up.add(move_up_label, BorderLayout.CENTER);
+        move_up.add(new JLabel(Utility.getImage("arrow-up.gif")), BorderLayout.EAST);
+        move_up.setMnemonic(KeyEvent.VK_U);
+        movement_pane = new JPanel();
+        plugin = new JComboBox(available);
+                //plugin.setEditable(true);
+        plugin.setSelectedIndex(0);
+        plugin_label = new JLabel(get("PlugIn"));
+        plugin_list = new JList(assigned);
+        plugin_list.setCellRenderer(new ListRenderer());
+        plugin_list_label = new JLabel(get("Assigned"));
+        plugin_list_label.setHorizontalAlignment(JLabel.CENTER);
+        plugin_list_label.setOpaque(true);
+        plugin_list_pane = new JPanel();
+        plugin_pane = new JPanel();
+        remove = new JButton(get("Remove"));
+        remove.setMnemonic(KeyEvent.VK_R);
+        title = new JLabel(get("Title"));
+        title.setHorizontalAlignment(JLabel.CENTER);
+        title.setOpaque(true);
+                // Listeners
+        add.addActionListener(new AddListener());
+        configure.addActionListener(new ConfigureListener());
+        MoveListener ml = new MoveListener();
+        move_bottom.addActionListener(ml);
+        move_down.addActionListener(ml);
+        move_top.addActionListener(ml);
+        move_up.addActionListener(ml);
+        remove.addActionListener(new RemoveListener());
+        plugin_list.addMouseListener(new ClickListener());
+                // Layout
+        title.setBorder(BorderFactory.createEmptyBorder(0,0,2,0));
+        instructions.setBorder(BorderFactory.createEmptyBorder(2,5,2,5));
+        header_pane.setLayout(new BorderLayout());
+        header_pane.add(title, BorderLayout.NORTH);
+        header_pane.add(new JScrollPane(instructions), BorderLayout.CENTER);
+        plugin_list_label.setBorder(BorderFactory.createEmptyBorder(0,2,0,2));
+        movement_pane.setLayout(new GridLayout(4,1));
+        movement_pane.add(move_top);
+        movement_pane.add(move_up);
+        movement_pane.add(move_down);
+        movement_pane.add(move_bottom);
+        plugin_list_pane.setLayout(new BorderLayout());
+        plugin_list_pane.add(plugin_list_label, BorderLayout.NORTH);
+        plugin_list_pane.add(new JScrollPane(plugin_list), BorderLayout.CENTER);
+        plugin_list_pane.add(movement_pane, BorderLayout.EAST);
+        plugin_label.setBorder(BorderFactory.createEmptyBorder(0,0,5,0));
+        plugin_pane.setBorder(BorderFactory.createEmptyBorder(5,0,5,0));
+        plugin_pane.setLayout(new GridLayout(1,2));
+        plugin_pane.add(plugin_label);
+        plugin_pane.add(plugin);
+                // Scope these mad bordering skillz.
+        JPanel temp = new JPanel(new BorderLayout());
+        temp.setBorder
+        (BorderFactory.createCompoundBorder
+         (BorderFactory.createEmptyBorder(5,0,5,0),
+          BorderFactory.createCompoundBorder
+          (BorderFactory.createTitledBorder(get("Controls")),
+           BorderFactory.createEmptyBorder(2,2,2,2))));
+        temp.add(plugin_pane, BorderLayout.NORTH);
+        temp.add(button_pane, BorderLayout.SOUTH);
+        central_pane.setLayout(new BorderLayout());
+        central_pane.add(plugin_list_pane, BorderLayout.CENTER);
+        central_pane.add(temp, BorderLayout.SOUTH);
+        button_pane.setLayout(new GridLayout(3,1));
+        button_pane.add(add);
+        button_pane.add(configure);
+        button_pane.add(remove);
+        setBorder(BorderFactory.createEmptyBorder(5,5,5,5));
+        setLayout(new BorderLayout());
+        add(header_pane, BorderLayout.NORTH);
+        add(central_pane, BorderLayout.CENTER);
+                //add(button_pane, BorderLayout.SOUTH);
+    }
+    /** Method which acts like a destructor, tidying up references to persistant objects.
             */
+          public Control() {
+                Object plugins[] = reserve.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"));
+                add.setMnemonic(KeyEvent.VK_A);
+                button_pane = new JPanel();
+                central_pane = new JPanel();
+                configure = new JButton(get("Configure"));
+                configure.setMnemonic(KeyEvent.VK_C);
+                header_pane = new JPanel();
+                instructions = new JTextArea(get("Instructions"));
+                instructions.setBackground(Gatherer.config.getColor("coloring.collection_tree_background", false));
+                instructions.setEditable(false);
+                instructions.setLineWrap(true);
+                instructions.setRows(5);
+                instructions.setWrapStyleWord(true);
+                move_bottom = new JButton();
+                JLabel move_bottom_label = new JLabel(get("Move_Bottom"));
+                move_bottom_label.setHorizontalAlignment(JLabel.CENTER);
+                move_bottom_label.setPreferredSize(LABEL_SIZE);
+                move_bottom.setLayout(new BorderLayout());
+                move_bottom.add(new JLabel(Utility.getImage("arrow-bottom.gif")), BorderLayout.WEST);
+                move_bottom.add(move_bottom_label, BorderLayout.CENTER);
+                move_bottom.add(new JLabel(Utility.getImage("arrow-bottom.gif")), BorderLayout.EAST);
+                move_bottom.setMnemonic(KeyEvent.VK_B);
+                move_down = new JButton();
+                JLabel move_down_label = new JLabel(get("Move_Down"));
+                move_down_label.setHorizontalAlignment(JLabel.CENTER);
+                move_down_label.setPreferredSize(LABEL_SIZE);
+                move_down.setLayout(new BorderLayout());
+                move_down.add(new JLabel(Utility.getImage("arrow-down.gif")), BorderLayout.WEST);
+                move_down.add(move_down_label, BorderLayout.CENTER);
+                move_down.add(new JLabel(Utility.getImage("arrow-down.gif")), BorderLayout.EAST);
+                move_down.setMnemonic(KeyEvent.VK_D);
+                move_top = new JButton();
+                JLabel move_top_label = new JLabel(get("Move_Top"));
+                move_top_label.setHorizontalAlignment(JLabel.CENTER);
+                move_top_label.setPreferredSize(LABEL_SIZE);
+                move_top.setLayout(new BorderLayout());
+                move_top.add(new JLabel(Utility.getImage("arrow-top.gif")), BorderLayout.WEST);
+                move_top.add(move_top_label, BorderLayout.CENTER);
+                move_top.add(new JLabel(Utility.getImage("arrow-top.gif")), BorderLayout.EAST);
+                move_top.setMnemonic(KeyEvent.VK_T);
+                move_up = new JButton();
+                JLabel move_up_label = new JLabel(get("Move_Up"));
+                move_up_label.setHorizontalAlignment(JLabel.CENTER);
+                move_up_label.setPreferredSize(LABEL_SIZE);
+                move_up.setLayout(new BorderLayout());
+                move_up.add(new JLabel(Utility.getImage("arrow-up.gif")), BorderLayout.WEST);
+                move_up.add(move_up_label, BorderLayout.CENTER);
+                move_up.add(new JLabel(Utility.getImage("arrow-up.gif")), BorderLayout.EAST);
+                move_up.setMnemonic(KeyEvent.VK_U);
+                movement_pane = new JPanel();
+                plugin = new JComboBox(available);
+                //plugin.setEditable(true);
+                plugin.setSelectedIndex(0);
+                plugin_label = new JLabel(get("PlugIn"));
+                plugin_list = new JList(assigned);
+                plugin_list.setCellRenderer(new ListRenderer());
+                plugin_list_label = new JLabel(get("Assigned"));
+                plugin_list_label.setHorizontalAlignment(JLabel.CENTER);
+                plugin_list_label.setOpaque(true);
+                plugin_list_pane = new JPanel();
+                plugin_pane = new JPanel();
+                remove = new JButton(get("Remove"));
+                remove.setMnemonic(KeyEvent.VK_R);
+                title = new JLabel(get("Title"));
+                title.setHorizontalAlignment(JLabel.CENTER);
+                title.setOpaque(true);
+                // Listeners
+                add.addActionListener(new AddListener());
+                configure.addActionListener(new ConfigureListener());
+                MoveListener ml = new MoveListener();
+                move_bottom.addActionListener(ml);
+                move_down.addActionListener(ml);
+                move_top.addActionListener(ml);
+                move_up.addActionListener(ml);
+                remove.addActionListener(new RemoveListener());
+                plugin_list.addMouseListener(new ClickListener());
+                // Layout
+                title.setBorder(BorderFactory.createEmptyBorder(0,0,2,0));
+                instructions.setBorder(BorderFactory.createEmptyBorder(2,5,2,5));
+                header_pane.setLayout(new BorderLayout());
+                header_pane.add(title, BorderLayout.NORTH);
+                header_pane.add(new JScrollPane(instructions), BorderLayout.CENTER);
+                plugin_list_label.setBorder(BorderFactory.createEmptyBorder(0,2,0,2));
+                movement_pane.setLayout(new GridLayout(4,1));
+                movement_pane.add(move_top);
+                movement_pane.add(move_up);
+                movement_pane.add(move_down);
+                movement_pane.add(move_bottom);
+                plugin_list_pane.setLayout(new BorderLayout());
+                plugin_list_pane.add(plugin_list_label, BorderLayout.NORTH);
+                plugin_list_pane.add(new JScrollPane(plugin_list), BorderLayout.CENTER);
+                plugin_list_pane.add(movement_pane, BorderLayout.EAST);
+                plugin_label.setBorder(BorderFactory.createEmptyBorder(0,0,5,0));
+                plugin_pane.setBorder(BorderFactory.createEmptyBorder(5,0,5,0));
+                plugin_pane.setLayout(new GridLayout(1,2));
+                plugin_pane.add(plugin_label);
+                plugin_pane.add(plugin);
+                // Scope these mad bordering skillz.
+                JPanel temp = new JPanel(new BorderLayout());
+                temp.setBorder
+                     (BorderFactory.createCompoundBorder
+                      (BorderFactory.createEmptyBorder(5,0,5,0),
+                        BorderFactory.createCompoundBorder
+                        (BorderFactory.createTitledBorder(get("Controls")),
+                         BorderFactory.createEmptyBorder(2,2,2,2))));
+                temp.add(plugin_pane, BorderLayout.NORTH);
+                temp.add(button_pane, BorderLayout.SOUTH);
+                central_pane.setLayout(new BorderLayout());
+                central_pane.add(plugin_list_pane, BorderLayout.CENTER);
+                central_pane.add(temp, BorderLayout.SOUTH);
+                button_pane.setLayout(new GridLayout(3,1));
+                button_pane.add(add);
+                button_pane.add(configure);
+                button_pane.add(remove);
+                setBorder(BorderFactory.createEmptyBorder(5,5,5,5));
+                setLayout(new BorderLayout());
+                add(header_pane, BorderLayout.NORTH);
+                add(central_pane, BorderLayout.CENTER);
+                //add(button_pane, BorderLayout.SOUTH);
+          }
+          /** Method which acts like a destructor, tidying up references to persistant objects.
+            */
+          public void destroy() {
+          }
+          /** This method is overridden in some control classes to allow for the updating of collection configuration when the focus is lost to another view. In this case however the updates are asynchronous and so no 'has the configuration changed without the user updating' check is needed.
+    public void destroy() {
+    }
+    /** This method is overridden in some control classes to allow for the updating of collection configuration when the focus is lost to another view. In this case however the updates are asynchronous and so no 'has the configuration changed without the user updating' check is needed.
             * @return <i>true</i> if this control has focus, <i>false</i> otherwise.
             */
           public boolean hasFocus() {
                 return super.hasFocus();
+          }
           /** This method is overridden to ensure the instructions are scrolled to top, before the super classes updateUI() is called.
+    public boolean hasFocus() {
+        return super.hasFocus();
+    }
+    /** This method is overridden to ensure the instructions are scrolled to top, before the super classes updateUI() is called.
             */
           public void updateUI() {
                 if(instructions != null) {
                      instructions.setCaretPosition(0);
+                }
                 super.updateUI();
+          }
           /** This class listens for actions upon the add button in the controls, and if detected calls the <i>assignPlugIn()</i> method.
+    public void updateUI() {
+        if(instructions != null) {
+        instructions.setCaretPosition(0);
+        }
+        super.updateUI();
+    }
+    /** This class listens for actions upon the add button in the controls, and if detected calls the <i>assignPlugIn()</i> method.
             */
           private class AddListener
                 implements ActionListener {
+    private class AddListener
+        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.
                  */
                 public void actionPerformed(ActionEvent event) {
                      PlugIn new_plugin = null;
                      Object object = plugin.getSelectedItem();
                      if(object instanceof PlugIn) {
                           PlugIn target = (PlugIn)object;
                           new_plugin = target.copy();
+                     }
                      else {
                           new_plugin = new PlugIn(object.toString(), "", null);
+                     }
                      object = null;
                      // Automatically chain to configuration. This ensures required arguments are filled out.
                      ArgumentConfiguration ac = new ArgumentConfiguration(gatherer, manager, new_plugin);
                      if(ac.display()) {
                           assignPlugIn(new_plugin);
                           plugin_list.setSelectedValue(new_plugin, true);
+                     }
                      ac = null;
                      new_plugin = null;
                      plugin.setSelectedIndex(0);
+                }
+          }
           /** This class listens for actions upon the configure button in the controls, and if detected creates a new <strong>ArgumentConfiguration</strong> dialog box to allow for configuration.
+        public void actionPerformed(ActionEvent event) {
+        PlugIn new_plugin = null;
+        Object object = plugin.getSelectedItem();
+        if(object instanceof PlugIn) {
+            PlugIn target = (PlugIn)object;
+            new_plugin = target.copy();
+        }
+        else {
+            new_plugin = new PlugIn(object.toString(), "", null);
+        }
+        object = null;
+        // Automatically chain to configuration. This ensures required arguments are filled out.
+        ArgumentConfiguration ac = new ArgumentConfiguration(gatherer, manager, new_plugin);
+        if(ac.display()) {
+            assignPlugIn(new_plugin);
+            plugin_list.setSelectedValue(new_plugin, true);
+        }
+        ac = null;
+        new_plugin = null;
+        plugin.setSelectedIndex(0);
+        }
+    }
+    /** This class listens for actions upon the configure button in the controls, and if detected creates a new <strong>ArgumentConfiguration</strong> dialog box to allow for configuration.
             * @see org.greenstone.gatherer.cdm.ArgumentConfiguration
             */
           private class ConfigureListener
                 implements ActionListener {
+    private class ConfigureListener
+        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.
                  */
                 public void actionPerformed(ActionEvent event) {
                      if(!plugin_list.isSelectionEmpty()) {
                           Object object = plugin_list.getSelectedValue();
                           if(object instanceof PlugIn) {
                                 ArgumentConfiguration ac = new ArgumentConfiguration(gatherer, manager, (PlugIn)object);
                                 if(ac.display()) {
                                      assigned.refresh();
+                                }
+                          }
+                     }
+                }
+          }
           /** A special list renderer which is able to render separating lines as well. */
           private class ListRenderer
                 extends DefaultListCellRenderer {
+        public void actionPerformed(ActionEvent event) {
+        if(!plugin_list.isSelectionEmpty()) {
+            Object object = plugin_list.getSelectedValue();
+            if(object instanceof PlugIn) {
+            ArgumentConfiguration ac = new ArgumentConfiguration(gatherer, manager, (PlugIn)object);
+            if(ac.display()) {
+                assigned.refresh();
+            }
+            }
+        }
+        }
+    }
+    /** A special list renderer which is able to render separating lines as well. */
+    private class ListRenderer
+        extends DefaultListCellRenderer {
                 /** Return a component that has been configured to display the specified value. That component's paint method is then called to "render" the cell. If it is necessary to compute the dimensions of a list because the list cells do not have a fixed size, this method is called to generate a component on which getPreferredSize  can be invoked.
                  * @param list - The <strong>JList</strong> we're painting.
 …
                  * @see javax.swing.ListSelectionModel
                  */
                 public Component getListCellRendererComponent(JList list, Object value, int index, boolean isSelected, boolean cellHasFocus) {
                      if(value instanceof JPanel) {
                           return (JPanel) value;
+                     }
                      else {
                           return super.getListCellRendererComponent(list, value, index, isSelected, cellHasFocus);
+                     }
+                }
+          }
           /** Listens for double clicks apon the list and react as if the configure button was pushed. */
           private class ClickListener
                 extends MouseAdapter {
+        public Component getListCellRendererComponent(JList list, Object value, int index, boolean isSelected, boolean cellHasFocus) {
+        if(value instanceof JPanel) {
+            return (JPanel) value;
+        }
+        else {
+            return super.getListCellRendererComponent(list, value, index, isSelected, cellHasFocus);
+        }
+        }
+    }
+    /** Listens for double clicks apon the list and react as if the configure button was pushed. */
+    private class ClickListener
+        extends MouseAdapter {
                 /** Called whenever the mouse is clicked over a registered component, we use this to chain through to the configure prompt.
                  * @param event A <strong>MouseEvent</strong> containing information about the mouse click.
                  */
                 public void mouseClicked(MouseEvent event) {
                      if(event.getClickCount() == 2 ) {
                           if(!plugin_list.isSelectionEmpty()) {
                                 Object object = plugin_list.getSelectedValue();
                                 if(object instanceof PlugIn) {
                                      ArgumentConfiguration ac = new ArgumentConfiguration(gatherer, manager, (PlugIn)object);
                                      if(ac.display()) {
                                           assigned.refresh();
+                                     }
+                                }
+                          }
+                     }
+                }
+          }
           /** Listens for actions apon the move buttons in the manager controls, and if detected calls the <i>movePlugIn()</i> method of the manager with the appropriate details. */
           private class MoveListener
                 implements ActionListener {
+        public void mouseClicked(MouseEvent event) {
+        if(event.getClickCount() == 2 ) {
+            if(!plugin_list.isSelectionEmpty()) {
+            Object object = plugin_list.getSelectedValue();
+            if(object instanceof PlugIn) {
+                ArgumentConfiguration ac = new ArgumentConfiguration(gatherer, manager, (PlugIn)object);
+                if(ac.display()) {
+                assigned.refresh();
+                }
+            }
+            }
+        }
+        }
+    }
+    /** Listens for actions apon the move buttons in the manager controls, and if detected calls the <i>movePlugIn()</i> method of the manager with the appropriate details. */
+    private class MoveListener
+        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.
                  */
                 public void actionPerformed(ActionEvent event) {
                      if(!plugin_list.isSelectionEmpty()) {
                           Object object = plugin_list.getSelectedValue();
                           if(object instanceof PlugIn) {
                                 PlugIn plugin = (PlugIn) object;
                                 if(event.getSource() == move_top) {
                                      movePlugIn(plugin, true, true);
+                                }
                                 else if(event.getSource() == move_up) {
                                      movePlugIn(plugin, true, false);
+                                }
                                 else if(event.getSource() == move_down) {
                                      movePlugIn(plugin, false, false);
+                                }
                                 else {
                                      movePlugIn(plugin, false, true);
+                                }
                                 plugin_list.setSelectedValue(plugin, true);
+                          }
+                     }
+                }
+          }
           /** This class listens for actions upon the remove button in the controls, and if detected calls the <i>removePlugIn()</i> method.
+        public void actionPerformed(ActionEvent event) {
+        if(!plugin_list.isSelectionEmpty()) {
+            Object object = plugin_list.getSelectedValue();
+            if(object instanceof PlugIn) {
+            PlugIn plugin = (PlugIn) object;
+            if(event.getSource() == move_top) {
+                movePlugIn(plugin, true, true);
+            }
+            else if(event.getSource() == move_up) {
+                movePlugIn(plugin, true, false);
+            }
+            else if(event.getSource() == move_down) {
+                movePlugIn(plugin, false, false);
+            }
+            else {
+                movePlugIn(plugin, false, true);
+            }
+            plugin_list.setSelectedValue(plugin, true);
+            }
+        }
+        }
+    }
+    /** This class listens for actions upon the remove button in the controls, and if detected calls the <i>removePlugIn()</i> method.
             */
           private class RemoveListener
                 implements ActionListener {
+    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.
                  */
                 public void actionPerformed(ActionEvent event) {
                      if(!plugin_list.isSelectionEmpty()) {
                           Object object = plugin_list.getSelectedValue();
                           if(object instanceof PlugIn) {
                                 removePlugIn((PlugIn)object);
+                          }
+                     }
+                }
+          }
+     }
      /** Creates a list separator.
+        public void actionPerformed(ActionEvent event) {
+        if(!plugin_list.isSelectionEmpty()) {
+            Object object = plugin_list.getSelectedValue();
+            if(object instanceof PlugIn) {
+            removePlugIn((PlugIn)object);
+            }
+        }
+        }
+    }
+    }
+    /** Creates a list separator.
       * Code courtesy of Farwell, Paul. Contact <a href="mailto:[email protected]">[email protected]</a>
       */
      static private JPanel getSeparator() {
           // we put the separator inside a panel to control
           // its appearance
           JPanel _sepPanel = new JPanel();
           _sepPanel.setOpaque(false);
           _sepPanel.setBorder(BorderFactory.createEmptyBorder(1, 3, 1, 3));
           _sepPanel.setLayout(new BoxLayout(_sepPanel, BoxLayout.Y_AXIS));
           _sepPanel.add(Box.createRigidArea(new Dimension(0, 4)));
           _sepPanel.add(new JPopupMenu.Separator());
           _sepPanel.add(Box.createRigidArea(new Dimension(0, 4)));
           return _sepPanel;
+     }
+    static private JPanel getSeparator() {
+    // we put the separator inside a panel to control
+    // its appearance
+    JPanel _sepPanel = new JPanel();
+    _sepPanel.setOpaque(false);
+    _sepPanel.setBorder(BorderFactory.createEmptyBorder(1, 3, 1, 3));
+    _sepPanel.setLayout(new BoxLayout(_sepPanel, BoxLayout.Y_AXIS));
+    _sepPanel.add(Box.createRigidArea(new Dimension(0, 4)));
+    _sepPanel.add(new JPopupMenu.Separator());
+    _sepPanel.add(Box.createRigidArea(new Dimension(0, 4)));
+    return _sepPanel;
+    }
+}

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

-              r4293
+              r4366
 */
 public class SubIndex
      extends Vector
      implements Comparable {
      /** Default Constructor.
       */
      public SubIndex() {
           super();
+     }
      /** Copy Constructor.
+    extends Vector
+    implements Comparable {
+    /** Default Constructor.
+     */
+    public SubIndex() {
+    super();
+    }
+    /** Copy Constructor.
       * @param original The <strong>Vector</strong> used to initially fill the SubIndex.
       */
      public SubIndex(Vector original) {
           super(original);
+     }
      /** Parsed data Constructor.
+    public SubIndex(Vector original) {
+    super(original);
+    }
+    /** Parsed data Constructor.
       * @param raw A <strong>String</strong> containing a comma separated list of subcollection names.
       * @param manager A reference to the <strong>SubcollectionManager</strong> via which we retrieve the required Subcollections.
       */
      public SubIndex(String raw, SubcollectionManager manager) {
           super();
           StringTokenizer tokenizer = new StringTokenizer(raw, ",");
           while(tokenizer.hasMoreTokens()) {
                 String name = tokenizer.nextToken();
                 Subcollection sub = manager.getSubcollection(name);
                 if(sub != null) {
                      add(sub);
+                }
+          }
+     }
      /** Method to compare two subindexes.
+    public SubIndex(String raw, SubcollectionManager manager) {
+    super();
+    StringTokenizer tokenizer = new StringTokenizer(raw, ",");
+    while(tokenizer.hasMoreTokens()) {
+        String name = tokenizer.nextToken();
+        Subcollection sub = manager.getSubcollection(name);
+        if(sub != null) {
+        add(sub);
+        }
+    }
+    }
+    /** Method to compare two subindexes.
       * @param object The other subindex to compare to, as an <strong>Object</strong>.
       * @return An <i>int</i> which is greater than, equal to or less than zero if the this object is before, equal to, or after the target object respectively.
       */
      public int compareTo(Object object) {
           SubIndex index = (SubIndex) object;
           return toString().compareTo(index.toString());
+     }
      /** Method to determine if this subindex contains a certain subcollection.
+    public int compareTo(Object object) {
+    SubIndex index = (SubIndex) object;
+    return toString().compareTo(index.toString());
+    }
+    /** Method to determine if this subindex contains a certain subcollection.
       * @param name The name, as a <strong>String</strong>, of the subcollection you are checking for.
       * @return A <i>boolean</i> which is <i>true</i> if this index contains the named subcollection, <i>false</i> otherwise.
       */
      public boolean containsSubcollection(String name) {
           for(int i = 0; i < size(); i++) {
                 Subcollection sub = (Subcollection) get(i);
                 if(sub.getName().equals(name)) {
                      return true;
+                }
+          }
           return false;
+     }
      /** Method to check two subindexes for equality.
+    public boolean containsSubcollection(String name) {
+    for(int i = 0; i < size(); i++) {
+        Subcollection sub = (Subcollection) get(i);
+        if(sub.getName().equals(name)) {
+        return true;
+        }
+    }
+    return false;
+    }
+    /** Method to check two subindexes for equality.
       * @param object The other subindex to compare to, as an <strong>Object</strong>.
       * @return A <i>boolean</i> which is <i>true</i> if the subindexes are equal, <i>false</i> otherwise.
       */
      public boolean equals(Object object) {
           if(compareTo(object) == 0) {
                 return true;
+          }
           return false;
+     }
      /** Method to generate a comma separated list from a subindex vector.
+    public boolean equals(Object object) {
+    if(compareTo(object) == 0) {
+        return true;
+    }
+    return false;
+    }
+    /** Method to generate a comma separated list from a subindex vector.
       * @return A <strong>String</strong> representing this subindex.
       */
      public String toString() {
           String text = "";
           for(int i = 0; i < size(); i++) {
                 Object object = get(i);
                 Subcollection sub = (Subcollection) get(i);
                 text = text + sub.getName();
                 if(i < size() - 1) {
                           text = text + ",";
+                }
+          }
           return text;
+     }
+    public String toString() {
+    String text = "";
+    for(int i = 0; i < size(); i++) {
+        Object object = get(i);
+        Subcollection sub = (Subcollection) get(i);
+        text = text + sub.getName();
+        if(i < size() - 1) {
+        text = text + ",";
+        }
+    }
+    return text;
+    }
+}

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

-              r4293
+              r4366
 */
 public class SubIndexes
      extends DefaultListModel {
      public void changed() {
           fireContentsChanged(this, 0, getSize() - 1);
+     }
      /** Method to display the contents of this class as an entry in the collection configuration file. The line contains the key word, then a space separated series of index entries.
       * @return A <strong>String</strong> representing this collection of indexes.
       */
      public String toString() {
           String text = "indexsubcollections  ";
           for(int i = 0; i < size(); i++) {
                 text = text + ((SubIndex)get(i)).toString();
                 if(i < size() - 1) {
                      text = text + " ";
+                }
+          }
           text = text + "\n";
           return text;
+     }
+    extends DefaultListModel {
+    public void changed() {
+    fireContentsChanged(this, 0, getSize() - 1);
+    }
+    /** Method to display the contents of this class as an entry in the collection configuration file. The line contains the key word, then a space separated series of index entries.
+     * @return A <strong>String</strong> representing this collection of indexes.
+     */
+    public String toString() {
+    String text = "indexsubcollections  ";
+    for(int i = 0; i < size(); i++) {
+        text = text + ((SubIndex)get(i)).toString();
+        if(i < size() - 1) {
+        text = text + " ";
+        }
+    }
+    text = text + "\n";
+    return text;
+    }
+}

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

-              r4293
+              r4366
 import org.w3c.dom.Element;
 /** This class encapsulates one subcollection entry in the collection configuration file.
 * @author John Thompson, Greenstone Digital Library, University of Waikato
 * @version 2.3
 */
+ * @author John Thompson, Greenstone Digital Library, University of Waikato
+ * @version 2.3
+ */
 public class Subcollection
      implements Comparable {
      /** A <i>boolean</i> which is <i>true</i> if the condition is an include one, <i>false</i> otherwise. */
      private boolean include = true;
      /** Either the fully qualified name of the metadata whose value should be matched against the given expression, or <i>null</i> if you wish to match against the file name. */
      private String element = null;
      /** A String containing a Perl expression which is used as the filter for this subcollection. */
      private String exp = null;
      /** A series of flags to be used when matching the expression. */
      private String flags = null;
      /** A String which is a unique identifier of a subcollection. */
      private String name = null;
      /** Constructor.
       * @param name A <strong>String</strong> which is a unique identifier of a subcollection.
       * @param pattern A <strong>String</strong> containing the inclusion, the element to filter, a Perl expression which is used as the filter for this subcollection, and a series of argument flags.
       */
      public Subcollection(String name, String pattern) {
           this.name = name;
           // Have to do some work on pattern.
           // Remove quote marks.
           if(pattern.startsWith("\"") || pattern.startsWith("'")) {
                 pattern = pattern.substring(1, pattern.length() - 1);
+          }
           // Test for exclusion
           if(pattern.startsWith("!")) {
                 this.include = false;
                 pattern = pattern.substring(1, pattern.length());
+          }
           else {
                 this.include = true;
+          }
           if(pattern.indexOf("/") != -1) {
+    implements Comparable {
+    /** A <i>boolean</i> which is <i>true</i> if the condition is an include one, <i>false</i> otherwise. */
+    private boolean include = true;
+    /** Either the fully qualified name of the metadata whose value should be matched against the given expression, or <i>null</i> if you wish to match against the file name. */
+    private String element = null;
+    /** A String containing a Perl expression which is used as the filter for this subcollection. */
+    private String exp = null;
+    /** A series of flags to be used when matching the expression. */
+    private String flags = null;
+    /** A String which is a unique identifier of a subcollection. */
+    private String name = null;
+    /** Constructor.
+     * @param name A <strong>String</strong> which is a unique identifier of a subcollection.
+     * @param pattern A <strong>String</strong> containing the inclusion, the element to filter, a Perl expression which is used as the filter for this subcollection, and a series of argument flags.
+     */
+    public Subcollection(String name, String pattern) {
+    this.name = name;
+    // Have to do some work on pattern.
+    // Remove quote marks.
+    if(pattern.startsWith("\"") || pattern.startsWith("'")) {
+        pattern = pattern.substring(1, pattern.length() - 1);
+    }
+    // Test for exclusion
+    if(pattern.startsWith("!")) {
+        this.include = false;
+        pattern = pattern.substring(1, pattern.length());
+    }
+    else {
+        this.include = true;
+    }
+    if(pattern.indexOf("/") != -1) {
                 // Now element (which may be Filename)
                 this.element = pattern.substring(0, pattern.indexOf("/"));
                 if(this.element.toLowerCase().equals("filename")) {
                      this.element = null;
+                }
+        this.element = pattern.substring(0, pattern.indexOf("/"));
+        if(this.element.toLowerCase().equals("filename")) {
+        this.element = null;
+        }
                 // Extract Perl expression
                 if(pattern.indexOf("/") != pattern.lastIndexOf("/")) {
                      this.exp = pattern.substring(pattern.indexOf("/") + 1,
                                                             pattern.lastIndexOf("/"));
                      this.flags = pattern.substring(pattern.lastIndexOf("/") + 1);
+                }
                 else {
                      this.exp = pattern.substring(pattern.indexOf("/") + 1);
+                }
+          }
           else {
+        if(pattern.indexOf("/") != pattern.lastIndexOf("/")) {
+        this.exp = pattern.substring(pattern.indexOf("/") + 1,
+                         pattern.lastIndexOf("/"));
+        this.flags = pattern.substring(pattern.lastIndexOf("/") + 1);
+        }
+        else {
+        this.exp = pattern.substring(pattern.indexOf("/") + 1);
+        }
+    }
+    else {
                 // Hmmm. Well I don't know what this is but it isn't a proper subcollection definition. Can't really 'return null' or something. So I'll just not set include, element, exp and flag expressions.
+          }
+     }
      /** Constructor.
+    }
+    }
+    /** Constructor.
       * @param name A <strong>String</strong> which is a unique identifier of a subcollection.
       * @param include A <i>boolean</i> which is <i>true</i> if the condition is an include one, <i>false</i> otherwise.
       * @param exp A <strong>String</strong> containing a Perl expression which is used as the filter for this subcollection.
       */
      public Subcollection(String name, boolean include, String exp, String flags) {
           this.element = null;
           this.exp = exp;
           this.flags = flags;
           this.include = include;
           this.name = name;
+     }
      /** Constructor.
+    public Subcollection(String name, boolean include, String exp, String flags) {
+    this.element = null;
+    this.exp = exp;
+    this.flags = flags;
+    this.include = include;
+    this.name = name;
+    }
+    /** Constructor.
       * @param name A <strong>String</strong> which is a unique identifier of a subcollection.
       * @param include A <i>boolean</i> which is <i>true</i> if the condition is an include one, <i>false</i> otherwise.
 …
       * @param flags A <strong>String</strong> of flags to be taken into account when matching the expression.
       */
      public Subcollection(String name, boolean include, String element, String exp, String flags) {
           this.element = element;
           this.exp = exp;
           this.flags = flags;
           this.include = include;
           this.name = name;
+     }
      /** Method to compare two subcollections.
+    public Subcollection(String name, boolean include, String element, String exp, String flags) {
+    this.element = element;
+    this.exp = exp;
+    this.flags = flags;
+    this.include = include;
+    this.name = name;
+    }
+    /** Method to compare two subcollections.
       * @param object The other subcollection to compare to, as an <strong>Object</strong>.
       * @return An <i>int</i> which is greater than, equal to or less than zero if the this object is before, equal to, or after the target object respectively.
       */
      public int compareTo(Object object) {
           Subcollection sub = (Subcollection) object;
           return getName().compareTo(sub.getName());
+     }
      /** Method to check two subcollections for equality.
+    public int compareTo(Object object) {
+    Subcollection sub = (Subcollection) object;
+    return getName().compareTo(sub.getName());
+    }
+    /** Method to check two subcollections for equality.
       * @param object The other subcollection to compare to, as an <strong>Object</strong>.
       * @return A <i>boolean</i> which is <i>true</i> if the subcollections are equal, <i>false</i> otherwise.
       */
      public boolean equals(Object object) {
           if(compareTo(object) == 0) {
                 return true;
+          }
           return false;
+     }
      /** Method to get the value of element.
+    public boolean equals(Object object) {
+    if(compareTo(object) == 0) {
+        return true;
+    }
+    return false;
+    }
+    /** Method to get the value of element.
       * @return The value of element as an <strong>String</strong>.
       */
      public String getElement() {
           return element;
+     }
      /** Method to get the value of expression.
+    public String getElement() {
+    return element;
+    }
+    /** Method to get the value of expression.
       * @return The value of exp as a <strong>String</strong>.
       */
      public String getExpression() {
           return exp;
+     }
      /** Method to get the value of flags.
+    public String getExpression() {
+    return exp;
+    }
+    /** Method to get the value of flags.
       * @return The value of flags as a <strong>String</strong>.
       */
      public String getFlags() {
           return flags;
+     }
      /** Method to get the value of include.
+    public String getFlags() {
+    return flags;
+    }
+    /** Method to get the value of include.
       * @param boolean The value of include as a <i>boolean</i>.
       */
      public boolean getInclude() {
           return include;
+     }
      /** Method to get the value of name.
+    public boolean getInclude() {
+    return include;
+    }
+    /** Method to get the value of name.
       * @param String The value of name as a <strong>String</string>.
       */
      public String getName() {
           return name;
+     }
      /** Method to get the name of the source of the strings used in pattern matching.
+    public String getName() {
+    return name;
+    }
+    /** Method to get the name of the source of the strings used in pattern matching.
       * @return A <strong>String</strong> which is either the fully qualified name of a metadata element, or "Filename".
       */
      public String getSource() {
           if(element != null) {
                 return element;
+          }
           return "Filename";
+     }
      /** Method to display the contents of this class as it would appear in the collection configuration file.
+    public String getSource() {
+    if(element != null) {
+        return element;
+    }
+    return "Filename";
+    }
+    /** Method to display the contents of this class as it would appear in the collection configuration file.
       * @return A <strong>String</strong> which could be used as a subcollection entry in collect.cfg.
       */
      public String toString() {
           String text = "subcollection        ";
           text = text + name + " ";
           text = text + "\"";
           if(!include) {
                 text = text + "!";
+          }
           if(element != null) {
                 text = text + element;
+          }
           else {
                 text = text + "Filename";
+          }
           text = text + "/";
           text = text + exp;
           text = text + "/";
           if(flags != null) {
                 text = text + flags;
+          }
           text = text + "\"\n";
           return text;
+     }
      /** Update certain fields of this subcollection.
+    public String toString() {
+    String text = "subcollection        ";
+    text = text + name + " ";
+    text = text + "\"";
+    if(!include) {
+        text = text + "!";
+    }
+    if(element != null) {
+        text = text + element;
+    }
+    else {
+        text = text + "Filename";
+    }
+    text = text + "/";
+    text = text + exp;
+    text = text + "/";
+    if(flags != null) {
+        text = text + flags;
+    }
+    text = text + "\"\n";
+    return text;
+    }
+    /** Update certain fields of this subcollection.
       * @param name A <strong>String</strong> which is a unique identifier of a subcollection.
       * @param source Either the fully qualified name of the metadata whose value should be matched against the given expression, or <i>null</i> if you wish to match against the file name.
 …
       * @param flags A <strong>String</strong> of flags to be taken into account when matching the expression.
         */
      public void update(String name, String source, String exp, boolean include, String flags) {
           this.name = name;
           this.element = source;
           this.exp = exp;
           this.include = include;
           this.flags = flags;
+     }
      /** Method to update the name of a metadata element, if it changes.
+    public void update(String name, String source, String exp, boolean include, String flags) {
+    this.name = name;
+    this.element = source;
+    this.exp = exp;
+    this.include = include;
+    this.flags = flags;
+    }
+    /** Method to update the name of a metadata element, if it changes.
       * @param old_name The current name of the element as a <strong>String</strong>.
       * @param new_name The new name of the element as a <strong>String</strong>.
       */
      public void updateElement(String old_name, String new_name) {
           if(element.equals(old_name)) {
                 element = new_name;
+          }
+     }
+    public void updateElement(String old_name, String new_name) {
+    if(element.equals(old_name)) {
+        element = new_name;
+    }
+    }
+}

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

-              r4293
+              r4366
 import org.w3c.dom.Element;
 /** This class maintains a list of subcollections within our collection, and also records which of these subcollections we are building indexes for.
 * @author John Thompson, Greenstone Digital Library, University of Waikato
 * @version 2.1
 */
+ * @author John Thompson, Greenstone Digital Library, University of Waikato
+ * @version 2.1
+ */
 public class SubcollectionManager
      extends DefaultListModel {
      /** The controls used to edit the settings of this manager. */
      private Control controls = null;
      /** A reference to this class so we can use it as a model in our inner classes. */
      private DefaultListModel model = null;
      /** The default index for the subcollections. */
      private DefaultSubIndex default_index = null;
      /** A reference to the Gatherer. */
      private Gatherer gatherer = null;
      /** A hashtable of subcollections, with mappings from name to subcollection. */
      private Hashtable subcollections = null;
      /** A vector-type structure of subcollection indexes. */
      private SubIndexes subindexes = null;
      /** A vector containing all of the subcollection commands that are unresolved, or in other words require that all 'subcollection <name> "<exp>"' to have been previously parsed before we can be certain their references will make sense. */
      private ArrayList unresolved = null;
      /** Constructor.
         * @param gatherer A reference to the <Strong>Gatherer</strong>.
         * @see org.greenstone.gatherer.cdm.SubIndexes
       */
      public SubcollectionManager(Gatherer gatherer) {
           super();
           this.gatherer = gatherer;
           this.model = this;
           this.subcollections = new Hashtable();
           this.subindexes = new SubIndexes();
           this.unresolved = new ArrayList();
+     }
      /** Method to add a subindex.
+    extends DefaultListModel {
+    /** The controls used to edit the settings of this manager. */
+    private Control controls = null;
+    /** A reference to this class so we can use it as a model in our inner classes. */
+    private DefaultListModel model = null;
+    /** The default index for the subcollections. */
+    private DefaultSubIndex default_index = null;
+    /** A reference to the Gatherer. */
+    private Gatherer gatherer = null;
+    /** A hashtable of subcollections, with mappings from name to subcollection. */
+    private Hashtable subcollections = null;
+    /** A vector-type structure of subcollection indexes. */
+    private SubIndexes subindexes = null;
+    /** A vector containing all of the subcollection commands that are unresolved, or in other words require that all 'subcollection <name> "<exp>"' to have been previously parsed before we can be certain their references will make sense. */
+    private ArrayList unresolved = null;
+    /** Constructor.
+     * @param gatherer A reference to the <Strong>Gatherer</strong>.
+     * @see org.greenstone.gatherer.cdm.SubIndexes
+     */
+    public SubcollectionManager(Gatherer gatherer) {
+    super();
+    this.gatherer = gatherer;
+    this.model = this;
+    this.subcollections = new Hashtable();
+    this.subindexes = new SubIndexes();
+    this.unresolved = new ArrayList();
+    }
+    /** Method to add a subindex.
       * @param subindex A <strong>SubIndex</strong>.
         * @see org.greenstone.gatherer.Gatherer
         * @see org.greenstone.gatherer.collection.CollectionManager
       */
      public void addSubIndex(SubIndex subindex) {
           if(!subindexes.contains(subindex)) {
                 subindexes.addElement(subindex);
                 gatherer.c_man.configurationChanged();
+          }
+     }
      /** Method to add a new subcollection. Adds it to both the underlying list model and the hashtable mapping names to subcollections.
+    public void addSubIndex(SubIndex subindex) {
+    if(!subindexes.contains(subindex)) {
+        subindexes.addElement(subindex);
+        gatherer.c_man.configurationChanged();
+    }
+    }
+    /** Method to add a new subcollection. Adds it to both the underlying list model and the hashtable mapping names to subcollections.
       * @param sub The <strong>Subcollection</strong> to add.
       * @return A <i>boolean</i> indicating if the addition was successful (<i>true</i>) or not (<i>false</i>).
 …
         * @see org.greenstone.gatherer.collection.CollectionManager
       */
      public boolean addSubcollection(Subcollection sub) {
           if(!contains(sub)) {
                 addElement(sub);
                 subcollections.put(sub.getName(), sub);
                 gatherer.c_man.configurationChanged();
                 return true;
+          }
           return false;
+     }
      /** A method to add a new subcollection, by specifying its name, metadata element if applicable and Perl expression to filter pages into or out of this collection.
+    public boolean addSubcollection(Subcollection sub) {
+    if(!contains(sub)) {
+        addElement(sub);
+        subcollections.put(sub.getName(), sub);
+        gatherer.c_man.configurationChanged();
+        return true;
+    }
+    return false;
+    }
+    /** A method to add a new subcollection, by specifying its name, metadata element if applicable and Perl expression to filter pages into or out of this collection.
       * @param name A <>>String</>> which is a unique identifier of a subcollection.
       * @param include A <i>boolean</i> indicating whether this is an inclusion filter (<i>true</i>) or an exclusion one (<i>false</i>).
 …
         * @see org.greenstone.gatherer.cdm.Subcollection
       */
      public boolean addSubcollection(String name, boolean include, String element, String exp, String flags) {
           Subcollection sub = null;
           if(element != null) {
                 sub = new Subcollection(name, include, element, exp, flags);
+          }
           else {
                 sub = new Subcollection(name, include, exp, flags);
+          }
           return addSubcollection(sub);
+     }
     /** Refresh all derived components using this manager as a model.
+    public boolean addSubcollection(String name, boolean include, String element, String exp, String flags) {
+    Subcollection sub = null;
+    if(element != null) {
+        sub = new Subcollection(name, include, element, exp, flags);
+    }
+    else {
+        sub = new Subcollection(name, include, exp, flags);
+    }
+    return addSubcollection(sub);
+    }
+    /** Refresh all derived components using this manager as a model.
     */
      public void changed() {
           fireContentsChanged(this, 0, getSize() - 1);
+     }
      /** Method to retrieve the controls for this manager.
+    public void changed() {
+    fireContentsChanged(this, 0, getSize() - 1);
+    }
+    /** Method to retrieve the controls for this manager.
       * @return A <Strong>Control</strong> object which contains the controls used to edit the subcollection data.
       */
      public Control getControls() {
           if(controls == null) {
                 controls = new Control();
+          }
           return controls;
+     }
      /** Method to retrieve the default index.
+    public Control getControls() {
+    if(controls == null) {
+        controls = new Control();
+    }
+    return controls;
+    }
+    /** Method to retrieve the default index.
       * @return A <strong>DefaultSubIndex</strong> object.
       */
      public DefaultSubIndex getDefaultSubIndex() {
           return default_index;
+     }
      /** Method to retrieve a certain subcollection by its name.
+    public DefaultSubIndex getDefaultSubIndex() {
+    return default_index;
+    }
+    /** Method to retrieve a certain subcollection by its name.
       * @param name A <strong>String</strong> which is used as the key for finding the matching subcollection.
       * @return The requested <strong>Subcollection</strong> or <i>null</i> if no such subcollection exists.
       */
      public Subcollection getSubcollection(String name) {
           return (Subcollection) subcollections.get(name);
+     }
      /** Method to get all of the subindexes set.
+    public Subcollection getSubcollection(String name) {
+    return (Subcollection) subcollections.get(name);
+    }
+    /** Method to get all of the subindexes set.
       * @return A <strong>SubIndexes</strong> object containing all the defined indexes.
       */
      public SubIndexes getSubIndexes() {
           return subindexes;
+     }
      /** Method to get all of the subcollections defined.
+    public SubIndexes getSubIndexes() {
+    return subindexes;
+    }
+    /** Method to get all of the subcollections defined.
       * @return A <strong>Vector</strong> of subcollections.
       */
      public Vector getSubcollections() {
           Vector subcollections = new Vector();
           for(int i = 0; i < size(); i++) {
                 subcollections.add(get(i));
+          }
           return subcollections;
+     }
     /** Mark the current controls, if any, as invalid and deallocate them. Any further use of the controls will requires them being rebuilt.
+    public Vector getSubcollections() {
+    Vector subcollections = new Vector();
+    for(int i = 0; i < size(); i++) {
+        subcollections.add(get(i));
+    }
+    return subcollections;
+    }
+    /** Mark the current controls, if any, as invalid and deallocate them. Any further use of the controls will requires them being rebuilt.
     * @see org.greenstone.gatherer.cdm.SubcollectionManager.Control
     */
     public void invalidateControls() {
           if(controls != null) {
                 controls.destroy();
                 controls = null;
+          }
+     }
      /** This method attempts to parse a subcollection related command from the given command string. If such a string is successfully parsed, it is immediately added to the data within this collection.
+    public void invalidateControls() {
+    if(controls != null) {
+        controls.destroy();
+        controls = null;
+    }
+    }
+    /** This method attempts to parse a subcollection related command from the given command string. If such a string is successfully parsed, it is immediately added to the data within this collection.
       * @param command The <strong>String</strong> to be parsed.
       * @param finished This <i>boolean</i> is usually <i>false</i> when called, unless this parse call is being made -after- the entire collection configuration file has been read in in which case it is <i>true</i>.
 …
       * @see org.greenstone.gatherer.cdm.SubIndex
       */
      public boolean parse(String command, boolean finished) {
           String temp = command.toLowerCase();
           CommandTokenizer tokenizer = new CommandTokenizer(command);
           tokenizer.nextToken(); // Throw away head.
           if(temp.startsWith("subcollection")) {
                 if(tokenizer.countTokens() >= 2) {
                      String name = tokenizer.nextToken();
                      String pattern = tokenizer.nextToken();
                      addSubcollection(new Subcollection(name, pattern));
                      return true;
+                }
+          }
           else if(temp.startsWith("indexsubcollections")) {
+    public boolean parse(String command, boolean finished) {
+    String temp = command.toLowerCase();
+    CommandTokenizer tokenizer = new CommandTokenizer(command);
+    tokenizer.nextToken(); // Throw away head.
+    if(temp.startsWith("subcollection")) {
+        if(tokenizer.countTokens() >= 2) {
+        String name = tokenizer.nextToken();
+        String pattern = tokenizer.nextToken();
+        addSubcollection(new Subcollection(name, pattern));
+        return true;
+        }
+    }
+    else if(temp.startsWith("indexsubcollections")) {
                 // These entries depend on what subcollections have previously been set, so we cannot safely parse them until after the file is complete.
                 if(!finished) {
                      unresolved.add(command);
+                }
                 else {
                      while(tokenizer.hasMoreTokens()) {
                           addSubIndex(new SubIndex(tokenizer.nextToken(), this));
+                     }
+                }
                 return true;
+          }
           else if(temp.startsWith("defaultsubcollection")) {
+        if(!finished) {
+        unresolved.add(command);
+        }
+        else {
+        while(tokenizer.hasMoreTokens()) {
+            addSubIndex(new SubIndex(tokenizer.nextToken(), this));
+        }
+        }
+        return true;
+    }
+    else if(temp.startsWith("defaultsubcollection")) {
                 // These entries depend on what subcollections have previously been set, so we cannot safely parse them until after the file is complete.
                 if(!finished) {
                      unresolved.add(command);
+                }
                 else {
                      if(tokenizer.hasMoreTokens()) {
                           setDefaultSubIndex(new DefaultSubIndex(tokenizer.nextToken(), this));
+                     }
+                }
                 return true;
+          }
           return false;
+     }
      /** Method to remove a certain subindex.
+        if(!finished) {
+        unresolved.add(command);
+        }
+        else {
+        if(tokenizer.hasMoreTokens()) {
+            setDefaultSubIndex(new DefaultSubIndex(tokenizer.nextToken(), this));
+        }
+        }
+        return true;
+    }
+    return false;
+    }
+    /** Method to remove a certain subindex.
       * @param subindex The <strong>SubIndex</strong> you wish to remove.
       * @see org.greenstone.gatherer.Gatherer
       * @see org.greenstone.gatherer.collection.CollectionManager
       */
      public void removeSubIndex(SubIndex subindex) {
           subindexes.removeElement(subindex);
           gatherer.c_man.configurationChanged();
+     }
      /** Method to remove all of the subindexes that contain a certain subcollection.
+    public void removeSubIndex(SubIndex subindex) {
+    subindexes.removeElement(subindex);
+    gatherer.c_man.configurationChanged();
+    }
+    /** Method to remove all of the subindexes that contain a certain subcollection.
       * @param sub The <strong>Subcollection</strong> that you wish to remove.
       * @see org.greenstone.gatherer.Gatherer
 …
       * @see org.greenstone.gatherer.collection.CollectionManager
       */
      public void removeSubIndexes(Subcollection sub) {
           for(int i = subindexes.size() - 1; i >= 0; i--) {
                 SubIndex subindex = (SubIndex)subindexes.get(i);
                 if(subindex.containsSubcollection(sub.getName())) {
                      subindexes.removeElement(subindex);
+                }
+          }
           gatherer.c_man.configurationChanged();
+     }
      /** Method to remove the given subcollection.
+    public void removeSubIndexes(Subcollection sub) {
+    for(int i = subindexes.size() - 1; i >= 0; i--) {
+        SubIndex subindex = (SubIndex)subindexes.get(i);
+        if(subindex.containsSubcollection(sub.getName())) {
+        subindexes.removeElement(subindex);
+        }
+    }
+    gatherer.c_man.configurationChanged();
+    }
+    /** Method to remove the given subcollection.
       * @param sub The <strong>Subcollection</strong> you want to remove.
       * @see org.greenstone.gatherer.Gatherer
       * @see org.greenstone.gatherer.collection.CollectionManager
       */
      public void removeSubcollection(Subcollection sub) {
           removeElement(sub);
           subcollections.remove(sub);
           gatherer.c_man.configurationChanged();
+     }
      /** Method to retry the parsing of commands that were previously unable to be parsed as they referenced subcollections that may not have been instantiated.
       */
      public void reparseUnresolved() {
           for(int i = 0; i < unresolved.size(); i++) {
                 parse((String)unresolved.get(i), true);
+          }
           unresolved.clear();
+     }
      /** Method to set the default subcollection index.
+    public void removeSubcollection(Subcollection sub) {
+    removeElement(sub);
+    subcollections.remove(sub);
+    gatherer.c_man.configurationChanged();
+    }
+    /** Method to retry the parsing of commands that were previously unable to be parsed as they referenced subcollections that may not have been instantiated.
+      */
+    public void reparseUnresolved() {
+    for(int i = 0; i < unresolved.size(); i++) {
+        parse((String)unresolved.get(i), true);
+    }
+    unresolved.clear();
+    }
+    /** Method to set the default subcollection index.
       * @param subcollection The <strong>Subcollection</strong> to use as the default index.
       * @see org.greenstone.gatherer.Gatherer
       * @see org.greenstone.gatherer.collection.CollectionManager
       */
      public void setDefaultSubIndex(DefaultSubIndex subindex) {
           this.default_index = subindex;
           if(subindex != null) {
                 addSubIndex(subindex.getSubIndex());
+          }
           gatherer.c_man.configurationChanged();
+     }
      /** This method causes the contents of this manager to be converted to a string, which is accomplished by calling <i>toString()</i> on each subcollection, then printing out the contents of the index vector.
+    public void setDefaultSubIndex(DefaultSubIndex subindex) {
+    this.default_index = subindex;
+    if(subindex != null) {
+        addSubIndex(subindex.getSubIndex());
+    }
+    gatherer.c_man.configurationChanged();
+    }
+    /** This method causes the contents of this manager to be converted to a string, which is accomplished by calling <i>toString()</i> on each subcollection, then printing out the contents of the index vector.
       * @return A <strong>String</strong> containing a block of configuration commands.
         * @see org.greenstone.gatherer.cdm.SubIndex
         * @see org.greenstone.gatherer.cdm.Subcollection
       */
      public String toString() {
           String text = "";
           // Retrieve the subcollection names and sort them.
           if(subcollections.size() > 0) {
                 Vector names = new Vector(subcollections.keySet());
                 Collections.sort(names);
                 for(int i = 0; i < names.size(); i++) {
                      Subcollection sub =
                           (Subcollection) subcollections.get(names.get(i));
                      text = text + sub.toString();
+                }
+    public String toString() {
+    String text = "";
+    // Retrieve the subcollection names and sort them.
+    if(subcollections.size() > 0) {
+        Vector names = new Vector(subcollections.keySet());
+        Collections.sort(names);
+        for(int i = 0; i < names.size(); i++) {
+        Subcollection sub =
+            (Subcollection) subcollections.get(names.get(i));
+        text = text + sub.toString();
+        }
                 // Now add a entry, separated by spaces for each subcollection
                 // index.
                 if(subindexes.size() > 0) {
                      text = text + subindexes.toString();
+                }
+        if(subindexes.size() > 0) {
+        text = text + subindexes.toString();
+        }
                 // Finally add the default subcollection index if necessary.
                 if(default_index != null) {
                      text = text + default_index.toString();
+                }
                 text = text + "\n";
+          }
           // Otherwise if there were no subcollections, there aren't going to be
           // subcollection indexes, nor a default subcollection index are there.
           return text;
+     }
      /** Method to retrieve a phrase from the dictionary based on a key.
+        if(default_index != null) {
+        text = text + default_index.toString();
+        }
+        text = text + "\n";
+    }
+    // Otherwise if there were no subcollections, there aren't going to be
+    // subcollection indexes, nor a default subcollection index are there.
+    return text;
+    }
+    /** Method to retrieve a phrase from the dictionary based on a key.
       * @param key A <strong>String</strong> used to find the correct phrase.
       * @param args A <strong>String[]</strong> of arguments used in formatting and filling out the phrase.
       * @return A <strong>String</strong> containing the correct phrase with the correct formatting.
       */
      private String get(String key) {
           return get(key, null);
+     }
      /** Method to retrieve a phrase from the dictionary based on a key.
+    private String get(String key) {
+    return get(key, null);
+    }
+    /** Method to retrieve a phrase from the dictionary based on a key.
       * @param key A <strong>String</strong> used to find the correct phrase.
       * @return A <strong>String</strong> containing the correct phrase with the correct formatting.
 …
       * @see org.greenstone.gatherer.Gatherer
       */
      private String get(String key, String args[]) {
           if(key.indexOf(".") == -1) {
                 key = "CDM.SubcollectionManager." + key;
+          }
           return gatherer.dictionary.get(key, args);
+     }
      /** This class creates a JPanel containing serveral more controls used for editing subcollection information. */
      private class Control
           extends JPanel {
             /** <i>true</i> if the current selection has changed. */
           private boolean changed = false;
           /** Button to add a subcollection. */
           private JButton add = null;
           /** Button to add a subindex. */
           private JButton add_index = null;
           /** Button to clear the default subindex. */
           private JButton clear_default = null;
           /** Button to remove a subcollection. */
           private JButton remove = null;
           /** Button to remove a subindex. */
           private JButton remove_index = null;
           /** Button to set the default subindex. */
           private JButton set_default = null;
           /** Button to cause an update of the subcollections. */
           private JButton update = null;
           /** A combobox allowing you to choose which field the data for matching should be taken from. Includes text body and filename, as well as all assigned metadata elements. */
           private JComboBox source = null;
           /** The list of assigned subcollections. */
           private JList subcollection_list = null;
           /** The list of subcollections available for the creation of subindexes. */
           private JList subcollection_list_2 = null;
           /** The list of assigned subindexes. */
           private JList subindexes_list = null;
           /** The label denoting the list of subindexes. */
           private JLabel subindexes_label = null;
           /** The panel containing the subcollection controls. */
           private JPanel subcollection_pane = null;
           /** The panel containing the subindex controls. */
           private JPanel subindex_pane = null;
           /** The tabbed pane used to store the subcollection and subindex controls. */
           private JTabbedPane tabbed_pane = null;
           /** The area used to display inline instructions. */
           private JTextArea instructions = null;
           /** The field displaying the name of the default subindex. */
           private JTextField default_value = null;
           /** A field used for specifying flags for the PERL expression matching, such as 'i' for case insensitive. */
           private JTextField flags = null;
           /** The pattern the source text must match. */
           private JTextField match = null;
           /** The name of this subcollection. */
           private JTextField name = null;
           /** When this button is selected the filter matching files are excluded. */
           private JToggleButton exclude = null;
           /** When this button is selected the filter matching files are included. */
           private JToggleButton include = null;
           /** The existing subcollection whose details you are reviewing, if any. */
           private Subcollection current = null;
             /** Constructor, creates the outer parts of the view, then calls two methods in turn to create the subcollection controls and subindex controls.
             */
           public Control() {
+    private String get(String key, String args[]) {
+    if(key.indexOf(".") == -1) {
+        key = "CDM.SubcollectionManager." + key;
+    }
+    return gatherer.dictionary.get(key, args);
+    }
+    /** This class creates a JPanel containing serveral more controls used for editing subcollection information. */
+    private class Control
+    extends JPanel {
+    /** <i>true</i> if the current selection has changed. */
+    private boolean changed = false;
+    /** Button to add a subcollection. */
+    private JButton add = null;
+    /** Button to add a subindex. */
+    private JButton add_index = null;
+    /** Button to clear the default subindex. */
+    private JButton clear_default = null;
+    /** Button to remove a subcollection. */
+    private JButton remove = null;
+    /** Button to remove a subindex. */
+    private JButton remove_index = null;
+    /** Button to set the default subindex. */
+    private JButton set_default = null;
+    /** Button to cause an update of the subcollections. */
+    private JButton update = null;
+    /** A combobox allowing you to choose which field the data for matching should be taken from. Includes text body and filename, as well as all assigned metadata elements. */
+    private JComboBox source = null;
+    /** The list of assigned subcollections. */
+    private JList subcollection_list = null;
+    /** The list of subcollections available for the creation of subindexes. */
+    private JList subcollection_list_2 = null;
+    /** The list of assigned subindexes. */
+    private JList subindexes_list = null;
+    /** The label denoting the list of subindexes. */
+    private JLabel subindexes_label = null;
+    /** The panel containing the subcollection controls. */
+    private JPanel subcollection_pane = null;
+    /** The panel containing the subindex controls. */
+    private JPanel subindex_pane = null;
+    /** The tabbed pane used to store the subcollection and subindex controls. */
+    private JTabbedPane tabbed_pane = null;
+    /** The area used to display inline instructions. */
+    private JTextArea instructions = null;
+    /** The field displaying the name of the default subindex. */
+    private JTextField default_value = null;
+    /** A field used for specifying flags for the PERL expression matching, such as 'i' for case insensitive. */
+    private JTextField flags = null;
+    /** The pattern the source text must match. */
+    private JTextField match = null;
+    /** The name of this subcollection. */
+    private JTextField name = null;
+    /** When this button is selected the filter matching files are excluded. */
+    private JToggleButton exclude = null;
+    /** When this button is selected the filter matching files are included. */
+    private JToggleButton include = null;
+    /** The existing subcollection whose details you are reviewing, if any. */
+    private Subcollection current = null;
+    /** Constructor, creates the outer parts of the view, then calls two methods in turn to create the subcollection controls and subindex controls.
+     */
+    public Control() {
                 // Create
                 JPanel border_pane = new JPanel();
                 JPanel header_pane = new JPanel();
                 instructions = new JTextArea(get("Instructions"));
                 instructions.setBackground(Gatherer.config.getColor("coloring.collection_tree_background", false));
                 instructions.setEditable(false);
                 instructions.setLineWrap(true);
                 instructions.setRows(5);
                 instructions.setWrapStyleWord(true);
                 tabbed_pane = new JTabbedPane();
                 JLabel title = new JLabel(get("Title"));
                 title.setHorizontalAlignment(JLabel.CENTER);
                 createSubcollection();
                 createSubindex();
+        JPanel border_pane = new JPanel();
+        JPanel header_pane = new JPanel();
+        instructions = new JTextArea(get("Instructions"));
+        instructions.setBackground(Gatherer.config.getColor("coloring.collection_tree_background", false));
+        instructions.setEditable(false);
+        instructions.setLineWrap(true);
+        instructions.setRows(5);
+        instructions.setWrapStyleWord(true);
+        tabbed_pane = new JTabbedPane();
+        JLabel title = new JLabel(get("Title"));
+        title.setHorizontalAlignment(JLabel.CENTER);
+        createSubcollection();
+        createSubindex();
                 // Add listeners
                 // Layout
                 instructions.setBorder(BorderFactory.createEmptyBorder(2,5,2,5));
                 header_pane.setBorder(BorderFactory.createEmptyBorder(5,5,5,5));
                 header_pane.setLayout(new BorderLayout());
                 header_pane.add(title, BorderLayout.NORTH);
                 header_pane.add(new JScrollPane(instructions), BorderLayout.CENTER);
                 tabbed_pane.addTab(get("Subcollection_Controls"), subcollection_pane);
                 tabbed_pane.addTab(get("Subindex_Controls"), subindex_pane);
                 border_pane.setBorder(BorderFactory.createEmptyBorder(0,5,5,5));
                 border_pane.setLayout(new BorderLayout());
                 border_pane.add(tabbed_pane, BorderLayout.CENTER);
                 setLayout(new BorderLayout());
                 add(header_pane, BorderLayout.NORTH);
                 add(border_pane, BorderLayout.CENTER);
+          }
             /** Create the subcollection controls.
+        instructions.setBorder(BorderFactory.createEmptyBorder(2,5,2,5));
+        header_pane.setBorder(BorderFactory.createEmptyBorder(5,5,5,5));
+        header_pane.setLayout(new BorderLayout());
+        header_pane.add(title, BorderLayout.NORTH);
+        header_pane.add(new JScrollPane(instructions), BorderLayout.CENTER);
+        tabbed_pane.addTab(get("Subcollection_Controls"), subcollection_pane);
+        tabbed_pane.addTab(get("Subindex_Controls"), subindex_pane);
+        border_pane.setBorder(BorderFactory.createEmptyBorder(0,5,5,5));
+        border_pane.setLayout(new BorderLayout());
+        border_pane.add(tabbed_pane, BorderLayout.CENTER);
+        setLayout(new BorderLayout());
+        add(header_pane, BorderLayout.NORTH);
+        add(border_pane, BorderLayout.CENTER);
+    }
+    /** Create the subcollection controls.
             * @see org.greenstone.gatherer.Gatherer
             * @see org.greenstone.gatherer.cdm.SubcollectionManager.Control.AddListener
 …
             * @see org.greenstone.gatherer.msm.MetadataSetManager
             */
           public void createSubcollection() {
+    public void createSubcollection() {
                 // Create
                 add = new JButton(get("Add"));
                 add.setMnemonic(KeyEvent.VK_A);
                 JPanel button_pane = new JPanel();
                 JPanel button_pane_1 = new JPanel();
                 JPanel button_pane_3 = new JPanel();
                 exclude = new JToggleButton(get("Exclude"));
                 exclude.setMnemonic(KeyEvent.VK_X);
                 flags = new JTextField();
                 JLabel flags_label = new JLabel(get("Flags"));
                 include = new JToggleButton(get("Include"));
                 include.setMnemonic(KeyEvent.VK_I);
                 JLabel inclusive_label = new JLabel(get("Inclusive"));
                 JPanel inclusive_pane = new JPanel();
                 match = new JTextField();
                 JLabel match_label = new JLabel(get("Match"));
                 name = new JTextField();
                 JLabel name_label = new JLabel(get("Name"));
                 remove = new JButton(get("Remove"));
                 remove.setMnemonic(KeyEvent.VK_R);
                 Vector source_model = gatherer.c_man.msm.getAssignedElements();
                 source_model.add(0, "Filename");
                 source = new JComboBox(source_model);
                 JLabel source_label = new JLabel(get("Source"));
                 subcollection_list = new JList(model);
                 subcollection_list.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
                 subcollection_pane = new JPanel();
                 ButtonGroup bg = new ButtonGroup();
                 bg.add(include);
                 bg.add(exclude);
                 include.setSelected(true);
                 JPanel subcollection_list_pane = new JPanel();
                 JLabel subcollection_list_label = new JLabel(get("Assigned"));
+        add = new JButton(get("Add"));
+        add.setMnemonic(KeyEvent.VK_A);
+        JPanel button_pane = new JPanel();
+        JPanel button_pane_1 = new JPanel();
+        JPanel button_pane_3 = new JPanel();
+        exclude = new JToggleButton(get("Exclude"));
+        exclude.setMnemonic(KeyEvent.VK_X);
+        flags = new JTextField();
+        JLabel flags_label = new JLabel(get("Flags"));
+        include = new JToggleButton(get("Include"));
+        include.setMnemonic(KeyEvent.VK_I);
+        JLabel inclusive_label = new JLabel(get("Inclusive"));
+        JPanel inclusive_pane = new JPanel();
+        match = new JTextField();
+        JLabel match_label = new JLabel(get("Match"));
+        name = new JTextField();
+        JLabel name_label = new JLabel(get("Name"));
+        remove = new JButton(get("Remove"));
+        remove.setMnemonic(KeyEvent.VK_R);
+        Vector source_model = gatherer.c_man.msm.getAssignedElements();
+        source_model.add(0, "Filename");
+        source = new JComboBox(source_model);
+        JLabel source_label = new JLabel(get("Source"));
+        subcollection_list = new JList(model);
+        subcollection_list.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
+        subcollection_pane = new JPanel();
+        ButtonGroup bg = new ButtonGroup();
+        bg.add(include);
+        bg.add(exclude);
+        include.setSelected(true);
+        JPanel subcollection_list_pane = new JPanel();
+        JLabel subcollection_list_label = new JLabel(get("Assigned"));
                 // Add listeners
                 add.addActionListener(new AddListener());
                 remove.addActionListener(new RemoveListener());
                 subcollection_list.addListSelectionListener(new ListListener());
+        add.addActionListener(new AddListener());
+        remove.addActionListener(new RemoveListener());
+        subcollection_list.addListSelectionListener(new ListListener());
                 // Layout
                 inclusive_pane.setLayout(new GridLayout());
                inclusive_pane.add(include);
                 inclusive_pane.add(exclude);
                 button_pane_1.setBorder(BorderFactory.createEmptyBorder(5,0,0,0));
                 button_pane_1.setLayout(new GridLayout(5, 2));
                 button_pane_1.add(name_label);
                 button_pane_1.add(name);
                 button_pane_1.add(source_label);
                 button_pane_1.add(source);
                 button_pane_1.add(match_label);
                 button_pane_1.add(match);
                 button_pane_1.add(inclusive_label);
                 button_pane_1.add(inclusive_pane);
                 button_pane_1.add(flags_label);
                 button_pane_1.add(flags);
                 button_pane_3.setBorder(BorderFactory.createEmptyBorder(5,0,0,0));
                 button_pane_3.setLayout(new GridLayout(1,2));
                 button_pane_3.add(add);
                 button_pane_3.add(remove);
                 button_pane.setLayout(new BorderLayout());
                 button_pane.add(button_pane_1, BorderLayout.CENTER);
                 button_pane.add(button_pane_3, BorderLayout.SOUTH);
                 subcollection_list_pane.setLayout(new BorderLayout());
                 subcollection_list_pane.add(subcollection_list_label, BorderLayout.NORTH);
                 subcollection_list_pane.add(new JScrollPane(subcollection_list), BorderLayout.CENTER);
                 subcollection_pane.setBorder(BorderFactory.createEmptyBorder(5,5,5,5));
                 subcollection_pane.setLayout(new BorderLayout());
                 subcollection_pane.add(subcollection_list_pane, BorderLayout.CENTER);
                 subcollection_pane.add(button_pane, BorderLayout.SOUTH);
+          }
             /** Create the subindex controls.
+        inclusive_pane.setLayout(new GridLayout());
+        inclusive_pane.add(include);
+        inclusive_pane.add(exclude);
+        button_pane_1.setBorder(BorderFactory.createEmptyBorder(5,0,0,0));
+        button_pane_1.setLayout(new GridLayout(5, 2));
+        button_pane_1.add(name_label);
+        button_pane_1.add(name);
+        button_pane_1.add(source_label);
+        button_pane_1.add(source);
+        button_pane_1.add(match_label);
+        button_pane_1.add(match);
+        button_pane_1.add(inclusive_label);
+        button_pane_1.add(inclusive_pane);
+        button_pane_1.add(flags_label);
+        button_pane_1.add(flags);
+        button_pane_3.setBorder(BorderFactory.createEmptyBorder(5,0,0,0));
+        button_pane_3.setLayout(new GridLayout(1,2));
+        button_pane_3.add(add);
+        button_pane_3.add(remove);
+        button_pane.setLayout(new BorderLayout());
+        button_pane.add(button_pane_1, BorderLayout.CENTER);
+        button_pane.add(button_pane_3, BorderLayout.SOUTH);
+        subcollection_list_pane.setLayout(new BorderLayout());
+        subcollection_list_pane.add(subcollection_list_label, BorderLayout.NORTH);
+        subcollection_list_pane.add(new JScrollPane(subcollection_list), BorderLayout.CENTER);
+        subcollection_pane.setBorder(BorderFactory.createEmptyBorder(5,5,5,5));
+        subcollection_pane.setLayout(new BorderLayout());
+        subcollection_pane.add(subcollection_list_pane, BorderLayout.CENTER);
+        subcollection_pane.add(button_pane, BorderLayout.SOUTH);
+    }
+    /** Create the subindex controls.
              * @see org.greenstone.gatherer.cdm.SubcollectionManager.Control.AddSubIndexListener
              * @see org.greenstone.gatherer.cdm.SubcollectionManager.Control.ClearDefaultListener
 …
              * @see org.greenstone.gatherer.util.ExclusiveListListener
              */
           public void createSubindex() {
+    public void createSubindex() {
                 // Creation
                 add_index = new JButton(get("Add_Subindex"));
                 add_index.setMnemonic(KeyEvent.VK_A);
                 JPanel button_pane_2 = new JPanel();
                 clear_default = new JButton(get("Clear_Default_Subindex"));
                 clear_default.setMnemonic(KeyEvent.VK_C);
                 if(default_index == null) {
                      clear_default.setEnabled(false);
+                }
                 JLabel default_label = new JLabel(get("Default_Subindex"));
                 JPanel default_pane = new JPanel();
                 if(default_index == null) {
                      default_value = new JTextField();
+                }
                 else {
                      default_value = new JTextField(default_index.getSubIndex().toString());
+                }
                 JPanel subindex_inner_pane_1 = new JPanel();
                 JPanel subindex_inner_pane_2 = new JPanel();
                 remove_index = new JButton(get("Remove_Subindex"));
                 remove_index.setMnemonic(KeyEvent.VK_R);
                 set_default = new JButton(get("Set_Default_Subindex"));
                 set_default.setMnemonic(KeyEvent.VK_S);
                 JLabel subcollection_label = new JLabel(get("Subcollection"));
                 subcollection_list_2 = new JList(model);
                 JPanel list_2_pane = new JPanel();
                 subindex_pane = new JPanel();
                 JLabel subindexes_label = new JLabel(get("Subindexes"));
                 subindexes_list = new JList(subindexes);
                 subindexes_list.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
                 JPanel subindexes_pane = new JPanel();
+        add_index = new JButton(get("Add_Subindex"));
+        add_index.setMnemonic(KeyEvent.VK_A);
+        JPanel button_pane_2 = new JPanel();
+        clear_default = new JButton(get("Clear_Default_Subindex"));
+        clear_default.setMnemonic(KeyEvent.VK_C);
+        if(default_index == null) {
+        clear_default.setEnabled(false);
+        }
+        JLabel default_label = new JLabel(get("Default_Subindex"));
+        JPanel default_pane = new JPanel();
+        if(default_index == null) {
+        default_value = new JTextField();
+        }
+        else {
+        default_value = new JTextField(default_index.getSubIndex().toString());
+        }
+        JPanel subindex_inner_pane_1 = new JPanel();
+        JPanel subindex_inner_pane_2 = new JPanel();
+        remove_index = new JButton(get("Remove_Subindex"));
+        remove_index.setMnemonic(KeyEvent.VK_R);
+        set_default = new JButton(get("Set_Default_Subindex"));
+        set_default.setMnemonic(KeyEvent.VK_S);
+        JLabel subcollection_label = new JLabel(get("Subcollection"));
+        subcollection_list_2 = new JList(model);
+        JPanel list_2_pane = new JPanel();
+        subindex_pane = new JPanel();
+        JLabel subindexes_label = new JLabel(get("Subindexes"));
+        subindexes_list = new JList(subindexes);
+        subindexes_list.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
+        JPanel subindexes_pane = new JPanel();
                 // Add listeners
                 ChangeListener cl = new ChangeListener();
                 ExclusiveListSelectionListener ell = new ExclusiveListSelectionListener();
                 ell.add(subcollection_list_2);
                 ell.add(subindexes_list);
                 add_index.addActionListener(new AddSubIndexListener());
                 clear_default.addActionListener(new ClearDefaultListener());
                 exclude.addActionListener(cl);
                 include.addActionListener(cl);
                 remove_index.addActionListener(new RemoveSubIndexListener());
                 set_default.addActionListener(new SetDefaultListener());
                 source.addActionListener(cl);
                 flags.addKeyListener(cl);
                 match.addKeyListener(cl);
                 name.addKeyListener(cl);
+        ChangeListener cl = new ChangeListener();
+        ExclusiveListSelectionListener ell = new ExclusiveListSelectionListener();
+        ell.add(subcollection_list_2);
+        ell.add(subindexes_list);
+        add_index.addActionListener(new AddSubIndexListener());
+        clear_default.addActionListener(new ClearDefaultListener());
+        exclude.addActionListener(cl);
+        include.addActionListener(cl);
+        remove_index.addActionListener(new RemoveSubIndexListener());
+        set_default.addActionListener(new SetDefaultListener());
+        source.addActionListener(cl);
+        flags.addKeyListener(cl);
+        match.addKeyListener(cl);
+        name.addKeyListener(cl);
                 // Layout
                 list_2_pane.setLayout(new BorderLayout());
                 list_2_pane.add(subcollection_label, BorderLayout.NORTH);
                 list_2_pane.add(new JScrollPane(subcollection_list_2), BorderLayout.CENTER);
                 subindexes_pane.setLayout(new BorderLayout());
                 subindexes_pane.add(subindexes_label, BorderLayout.NORTH);
                 subindexes_pane.add(new JScrollPane(subindexes_list), BorderLayout.CENTER);
                 subindex_inner_pane_2.setLayout(new GridLayout(2,1));
                 subindex_inner_pane_2.add(list_2_pane);
                 subindex_inner_pane_2.add(subindexes_pane);
                 default_label.setBorder(BorderFactory.createEmptyBorder(0,0,0,5));
                 default_pane.setBorder(BorderFactory.createCompoundBorder(BorderFactory.createCompoundBorder(BorderFactory.createEmptyBorder(5,5,5,5), BorderFactory.createRaisedBevelBorder()), BorderFactory.createEmptyBorder(2,2,2,2)));
                 default_pane.setLayout(new BorderLayout());
                 default_pane.add(default_label, BorderLayout.WEST);
                 default_pane.add(default_value, BorderLayout.CENTER);
                 subindex_inner_pane_1.setLayout(new BorderLayout());
                 subindex_inner_pane_1.add(subindex_inner_pane_2, BorderLayout.CENTER);
                 subindex_inner_pane_1.add(default_pane, BorderLayout.SOUTH);
                 button_pane_2.setLayout(new GridLayout(2,2));
                 button_pane_2.add(add_index);
                 button_pane_2.add(remove_index);
                 button_pane_2.add(clear_default);
                 button_pane_2.add(set_default);
                 subindex_pane.setBorder(BorderFactory.createEmptyBorder(5,5,5,5));
                 subindex_pane.setLayout(new BorderLayout());
                 subindex_pane.add(subindex_inner_pane_1, BorderLayout.CENTER);
                 subindex_pane.add(button_pane_2, BorderLayout.SOUTH);
+          }
           /** Method to unregister any listeners to avoid memory leaks.
+        list_2_pane.setLayout(new BorderLayout());
+        list_2_pane.add(subcollection_label, BorderLayout.NORTH);
+        list_2_pane.add(new JScrollPane(subcollection_list_2), BorderLayout.CENTER);
+        subindexes_pane.setLayout(new BorderLayout());
+        subindexes_pane.add(subindexes_label, BorderLayout.NORTH);
+        subindexes_pane.add(new JScrollPane(subindexes_list), BorderLayout.CENTER);
+        subindex_inner_pane_2.setLayout(new GridLayout(2,1));
+        subindex_inner_pane_2.add(list_2_pane);
+        subindex_inner_pane_2.add(subindexes_pane);
+        default_label.setBorder(BorderFactory.createEmptyBorder(0,0,0,5));
+        default_pane.setBorder(BorderFactory.createCompoundBorder(BorderFactory.createCompoundBorder(BorderFactory.createEmptyBorder(5,5,5,5), BorderFactory.createRaisedBevelBorder()), BorderFactory.createEmptyBorder(2,2,2,2)));
+        default_pane.setLayout(new BorderLayout());
+        default_pane.add(default_label, BorderLayout.WEST);
+        default_pane.add(default_value, BorderLayout.CENTER);
+        subindex_inner_pane_1.setLayout(new BorderLayout());
+        subindex_inner_pane_1.add(subindex_inner_pane_2, BorderLayout.CENTER);
+        subindex_inner_pane_1.add(default_pane, BorderLayout.SOUTH);
+        button_pane_2.setLayout(new GridLayout(2,2));
+        button_pane_2.add(add_index);
+        button_pane_2.add(remove_index);
+        button_pane_2.add(clear_default);
+        button_pane_2.add(set_default);
+        subindex_pane.setBorder(BorderFactory.createEmptyBorder(5,5,5,5));
+        subindex_pane.setLayout(new BorderLayout());
+        subindex_pane.add(subindex_inner_pane_1, BorderLayout.CENTER);
+        subindex_pane.add(button_pane_2, BorderLayout.SOUTH);
+    }
+    /** Method to unregister any listeners to avoid memory leaks.
             */
           public void destroy() {
+          }
           /** We have overriden this method to provide completely different functionality, given that our JPanel will never actually have focus. We call this method in GUI on the view we are about to replace, and this method checks if a change has occured and if so updates the current object.
+    public void destroy() {
+    }
+    /** We have overriden this method to provide completely different functionality, given that our JPanel will never actually have focus. We call this method in GUI on the view we are about to replace, and this method checks if a change has occured and if so updates the current object.
             * @return A <i>boolean</i> which is always <i>false</i>.
             * @see org.greenstone.gatherer.msm.ElementWrapper
             */
           public boolean hasFocus() {
+    public boolean hasFocus() {
                 // If we have a current metadata open, and something has changed then save the change.
                 if(changed && current != null) {
                      String n = name.getText();
                      String s = null;
                      Object o = source.getSelectedItem();
                      if(o instanceof ElementWrapper) {
                           ElementWrapper e = (ElementWrapper)o;
                           s = e.toString();
+                     }
                      String e = match.getText();
                      String f = flags.getText();
                      if(n != null && n.length() > 0 && (s == null || s.length() > 0) && e != null && e.length() > 0) {
                           current.update(n, s, e, include.isSelected(), f);
                           int index = model.indexOf(current);
                           changed();
                           subindexes.changed();
                           if(default_index != null) {
                                 default_value.setText(default_index.getSubIndex().toString());
+                          }
+                     }
                      changed = false;
+                }
                 return false;
+          }
           /** Overriden to ensure the instructions are scrolled to top.
+        if(changed && current != null) {
+        String n = name.getText();
+        String s = null;
+        Object o = source.getSelectedItem();
+        if(o instanceof ElementWrapper) {
+            ElementWrapper e = (ElementWrapper)o;
+            s = e.toString();
+        }
+        String e = match.getText();
+        String f = flags.getText();
+        if(n != null && n.length() > 0 && (s == null || s.length() > 0) && e != null && e.length() > 0) {
+            current.update(n, s, e, include.isSelected(), f);
+            int index = model.indexOf(current);
+            changed();
+            subindexes.changed();
+            if(default_index != null) {
+            default_value.setText(default_index.getSubIndex().toString());
+            }
+        }
+        changed = false;
+        }
+        return false;
+    }
+    /** Overriden to ensure the instructions are scrolled to top.
           */
           public void updateUI() {
                 if(instructions != null) {
                      instructions.setCaretPosition(0);
+                }
                 super.updateUI();
+          }
           /** Listens for actions apon the 'add' button in the SubcollectionManager controls, and if detected calls the addSubcollection method of the manager with a newly created subcollection. */
           private class AddListener
                 implements ActionListener {
+    public void updateUI() {
+        if(instructions != null) {
+        instructions.setCaretPosition(0);
+        }
+        super.updateUI();
+    }
+    /** Listens for actions apon the 'add' button in the SubcollectionManager controls, and if detected calls the addSubcollection method of the manager with a newly created subcollection. */
+    private class AddListener
+        implements ActionListener {
                 /** Any implementation of ActionListener must include this method so we can be informed when an action has been performed on one of our target controls. In this case we wish to retrieve information from the various edit controls, and if we have sufficient data to build a new subcollection do so.
                  * @param event An <strong>ActionEvent</strong> containing information about the event.
 …
                  * @see org.greenstone.gatherer.msm.ElementWrapper
                  */
                 public void actionPerformed(ActionEvent event) {
                      String n = name.getText();
                      String s = null;
                      Object o = source.getSelectedItem();
                      if(o instanceof ElementWrapper) {
                           ElementWrapper e = (ElementWrapper)o;
                           s = e.toString();
+                     }
                      String e = match.getText();
                      String f = flags.getText();
                      if(n != null && n.length() > 0 && (s == null || s.length() > 0) && e != null && e.length() > 0) {
                           Subcollection sub = new Subcollection(n, include.isSelected(), s, e, f);
                           addSubcollection(sub);
+                     }
                      changed = false;
+                }
+          }
           /** Listens for actions apon the 'add subindex' button in the SubcollectionManager controls, and if detected calls the addSubindex method of the manager with a newly created subindex. */
           private class AddSubIndexListener
                 implements ActionListener {
+        public void actionPerformed(ActionEvent event) {
+        String n = name.getText();
+        String s = null;
+        Object o = source.getSelectedItem();
+        if(o instanceof ElementWrapper) {
+            ElementWrapper e = (ElementWrapper)o;
+            s = e.toString();
+        }
+        String e = match.getText();
+        String f = flags.getText();
+        if(n != null && n.length() > 0 && (s == null || s.length() > 0) && e != null && e.length() > 0) {
+            Subcollection sub = new Subcollection(n, include.isSelected(), s, e, f);
+            addSubcollection(sub);
+        }
+        changed = false;
+        }
+    }
+    /** Listens for actions apon the 'add subindex' button in the SubcollectionManager controls, and if detected calls the addSubindex method of the manager with a newly created subindex. */
+    private class AddSubIndexListener
+        implements ActionListener {
                 /** Any implementation of ActionListener must include this method so we can be informed when an action has been performed on one of our target controls. In this case we want to check if they have a series of subcollections selected, and if so build an new subindex based apon them.
                  * @param event An <strong>ActionEvent</strong> containing information about the event.
                  * @see org.greenstone.gatherer.cdm.SubIndex
                  */
                 public void actionPerformed(ActionEvent event) {
                      if(!subcollection_list_2.isSelectionEmpty()) {
                           Vector selected = new Vector();
                           Object raw[] = subcollection_list_2.getSelectedValues();
                           for(int i = 0; i < raw.length; i++) {
                                 selected.add(raw[i]);
+                          }
                           addSubIndex(new SubIndex(selected));
+                     }
+                }
+          }
           /** This class listens for any key entry in a text field, selection change in a combobox or button click, and when detected sets the changed flag to true. Its also convenient to use this class to test if the add button should be active yet. */
           public class ChangeListener
                 extends KeyAdapter
                 implements ActionListener {
+        public void actionPerformed(ActionEvent event) {
+        if(!subcollection_list_2.isSelectionEmpty()) {
+            Vector selected = new Vector();
+            Object raw[] = subcollection_list_2.getSelectedValues();
+            for(int i = 0; i < raw.length; i++) {
+            selected.add(raw[i]);
+            }
+            addSubIndex(new SubIndex(selected));
+        }
+        }
+    }
+    /** This class listens for any key entry in a text field, selection change in a combobox or button click, and when detected sets the changed flag to true. Its also convenient to use this class to test if the add button should be active yet. */
+    public class ChangeListener
+        extends KeyAdapter
+        implements ActionListener {
                 /** Any implementation of ActionListener must include this method so we can be informed when an action has been performed on one of our target controls. In this case we want to record that somethings changed, then validate the controls.
                  * @param event An <strong>ActionEvent</strong> containing information about the event.
                  */
                 public void actionPerformed(ActionEvent event) {
                      changed = true;
                      validate();
+                }
+        public void actionPerformed(ActionEvent event) {
+        changed = true;
+        validate();
+        }
                 /** Any inheritor of KeyAdapter can override this method so we can be informed when an key has been type in one of our target controls. In this case we want to record that somethings changed, then validate the controls.
                  * @param event An <strong>KeyEvent</strong> containing information about the event.
                  */
                 public void keyPressed(KeyEvent event) {
                      changed = true;
                      validate();
+                }
+        public void keyPressed(KeyEvent event) {
+        changed = true;
+        validate();
+        }
                 /** Method to validate the current editor values, and enable or disable controls based on said values. */
                 private void validate() {
                      if(changed && name.getText().length() > 0 && match.getText().length() > 0) {
                           add.setEnabled(true);
+                     }
                      else {
                           add.setEnabled(false);
+                     }
+                }
+          }
           /** Listens for actions apon the 'clear default subindex' button in the SubcollectionManager controls, and if detected calls the setDefaultSubIndex() method of the manager with <i>null</i>. */
           private class ClearDefaultListener
                 implements ActionListener {
+        private void validate() {
+        if(changed && name.getText().length() > 0 && match.getText().length() > 0) {
+            add.setEnabled(true);
+        }
+        else {
+            add.setEnabled(false);
+        }
+        }
+    }
+    /** Listens for actions apon the 'clear default subindex' button in the SubcollectionManager controls, and if detected calls the setDefaultSubIndex() method of the manager with <i>null</i>. */
+    private class ClearDefaultListener
+        implements ActionListener {
                 /** Any implementation of ActionListener must include this method so we can be informed when an action has been performed on one of our target controls. In this case we want to clear the default subindex.
                  * @param event An <strong>ActionEvent</strong> containing information about the event.
                  */
                 public void actionPerformed(ActionEvent event) {
                      setDefaultSubIndex(null);
                      clear_default.setEnabled(false);
                      default_value.setText("");
+                }
+          }
           /** This class listens for selections in the list on the subcollections pane of the SubcollectionManager, and updates the controls as necessary to reflect selection. */
           private class ListListener
                 implements ListSelectionListener {
+        public void actionPerformed(ActionEvent event) {
+        setDefaultSubIndex(null);
+        clear_default.setEnabled(false);
+        default_value.setText("");
+        }
+    }
+    /** This class listens for selections in the list on the subcollections pane of the SubcollectionManager, and updates the controls as necessary to reflect selection. */
+    private class ListListener
+        implements ListSelectionListener {
                 /** Any implementation of ListSelectionListener must include this method so we can be informed when the selection changes. In this case we want to execute any changes the users made to the entry, then update the controls with details of the new selection.
                  * @param event A <strong>ListSelectionEvent</strong> containing information related to this event.
 …
                  * @see org.greenstone.gatherer.msm.ElementWrapper
                  */
                 public void valueChanged(ListSelectionEvent event) {
                      // If we have a previous collection and the users changed something, but not added, then update subcollection.
                      if(changed && current != null) {
                           String n = name.getText();
                           String s = null;
                           Object o = source.getSelectedItem();
                           if(o instanceof ElementWrapper) {
                                 ElementWrapper e = (ElementWrapper)o;
                                 s = e.toString();
+                          }
                           String e = match.getText();
                           String f = flags.getText();
                           if(n != null && n.length() > 0 && (s == null || s.length() > 0) && e != null && e.length() > 0) {
                                 current.update(n, s, e, include.isSelected(), f);
                                 int index = model.indexOf(current);
                                 changed();
                                 subindexes.changed();
                                 if(default_index != null) {
                                      default_value.setText(default_index.getSubIndex().toString());
+                                }
+                          }
+                     }
                      // Now load the new entry.
                      if(!subcollection_list.isSelectionEmpty()) {
                           current = (Subcollection) subcollection_list.getSelectedValue();
                           flags.setText(current.getFlags());
                           include.setSelected(current.getInclude());
                           exclude.setSelected(!current.getInclude());
                           match.setText(current.getExpression());
                           name.setText(current.getName());
                           String s = current.getSource();
                           int pos = 0;
                           Object value = source.getItemAt(pos);
                           while(value != null) {
                                 if(value instanceof ElementWrapper) {
                                      ElementWrapper e = (ElementWrapper) value;
                                      if(e.toString().equals(s)) {
                                           source.setSelectedIndex(pos);
                                           value = null;
+                                     }
                                      else {
                                           pos++;
                                           value = source.getItemAt(pos);
+                                     }
+                                }
                                 else if(value.toString().equals(s)) {
                                      source.setSelectedIndex(pos);
                                      value = null;
+                                }
                                 else {
                                      pos++;
                                      value = source.getItemAt(pos);
+                                }
+                          }
                           // Can't add one thats already there.
                           add.setEnabled(false);
                           // You can remove it though...
                           remove.setEnabled(true);
+                     }
                      else {
                           flags.setText("");
                           include.setSelected(true);
                           match.setText("");
                           name.setText("");
                           source.setSelectedIndex(0);
                           remove.setEnabled(false);
+                     }
                      // Have to do this after so we don't get called when nothings actually changed.
                      changed = false;
+                }
+          }
           /** Listens for actions apon the 'remove' button in the SubcollectionManager controls, and if detected calls the remove method of the manager with the SubIndex selected for removal. */
           private class RemoveListener
                 implements ActionListener {
+        public void valueChanged(ListSelectionEvent event) {
+        // If we have a previous collection and the users changed something, but not added, then update subcollection.
+        if(changed && current != null) {
+            String n = name.getText();
+            String s = null;
+            Object o = source.getSelectedItem();
+            if(o instanceof ElementWrapper) {
+            ElementWrapper e = (ElementWrapper)o;
+            s = e.toString();
+            }
+            String e = match.getText();
+            String f = flags.getText();
+            if(n != null && n.length() > 0 && (s == null || s.length() > 0) && e != null && e.length() > 0) {
+            current.update(n, s, e, include.isSelected(), f);
+            int index = model.indexOf(current);
+            changed();
+            subindexes.changed();
+            if(default_index != null) {
+                default_value.setText(default_index.getSubIndex().toString());
+            }
+            }
+        }
+        // Now load the new entry.
+        if(!subcollection_list.isSelectionEmpty()) {
+            current = (Subcollection) subcollection_list.getSelectedValue();
+            flags.setText(current.getFlags());
+            include.setSelected(current.getInclude());
+            exclude.setSelected(!current.getInclude());
+            match.setText(current.getExpression());
+            name.setText(current.getName());
+            String s = current.getSource();
+            int pos = 0;
+            Object value = source.getItemAt(pos);
+            while(value != null) {
+            if(value instanceof ElementWrapper) {
+                ElementWrapper e = (ElementWrapper) value;
+                if(e.toString().equals(s)) {
+                source.setSelectedIndex(pos);
+                value = null;
+                }
+                else {
+                pos++;
+                value = source.getItemAt(pos);
+                }
+            }
+            else if(value.toString().equals(s)) {
+                source.setSelectedIndex(pos);
+                value = null;
+            }
+            else {
+                pos++;
+                value = source.getItemAt(pos);
+            }
+            }
+            // Can't add one thats already there.
+            add.setEnabled(false);
+            // You can remove it though...
+            remove.setEnabled(true);
+        }
+        else {
+            flags.setText("");
+            include.setSelected(true);
+            match.setText("");
+            name.setText("");
+            source.setSelectedIndex(0);
+            remove.setEnabled(false);
+        }
+        // Have to do this after so we don't get called when nothings actually changed.
+        changed = false;
+        }
+    }
+    /** Listens for actions apon the 'remove' button in the SubcollectionManager controls, and if detected calls the remove method of the manager with the SubIndex selected for removal. */
+    private class RemoveListener
+        implements ActionListener {
                 /** Any implementation of ActionListener must include this method so we can be informed when an action has been performed on one of our target controls. In this case we want to check if they have a subcolleciton selected, and if so remove both it and any subindexes based on it.
                  * @param event An <strong>ActionEvent</strong> containing information about the event.
                  * @see org.greenstone.gatherer.cdm.Subcollection
                  */
                 public void actionPerformed(ActionEvent event) {
                      if(!subcollection_list.isSelectionEmpty()) {
                           Subcollection sub_col = (Subcollection)subcollection_list.getSelectedValue();
                           removeSubIndexes(sub_col);
                           removeSubcollection(sub_col);
+                     }
+                }
+          }
           /** Listens for actions apon the 'remove subindex' button in the SubcollectionManager controls, and if detected calls the removeSubIndex method of the manager with the SubIndex selected for removal. */
           private class RemoveSubIndexListener
                 implements ActionListener {
+        public void actionPerformed(ActionEvent event) {
+        if(!subcollection_list.isSelectionEmpty()) {
+            Subcollection sub_col = (Subcollection)subcollection_list.getSelectedValue();
+            removeSubIndexes(sub_col);
+            removeSubcollection(sub_col);
+        }
+        }
+    }
+    /** Listens for actions apon the 'remove subindex' button in the SubcollectionManager controls, and if detected calls the removeSubIndex method of the manager with the SubIndex selected for removal. */
+    private class RemoveSubIndexListener
+        implements ActionListener {
                 /** Any implementation of ActionListener must include this method so we can be informed when an action has been performed on one of our target controls. In this case we want to check if they have a subindex selected, and if so remove it.
                  * @param event An <strong>ActionEvent</strong> containing information about the event.
                  * @see org.greenstone.gatherer.cdm.SubIndex
                  */
                 public void actionPerformed(ActionEvent event) {
                      if(!subindexes_list.isSelectionEmpty()) {
                           removeSubIndex((SubIndex)subindexes_list.getSelectedValue());
+                     }
+                }
+          }
           /** Listens for actions apon the 'set default subindex' button in the SubcollectionManager controls, and if detected calls the setDefaultSubIndex method of the manager with the SubIndex selected for default. */
           private class SetDefaultListener
                 implements ActionListener {
+        public void actionPerformed(ActionEvent event) {
+        if(!subindexes_list.isSelectionEmpty()) {
+            removeSubIndex((SubIndex)subindexes_list.getSelectedValue());
+        }
+        }
+    }
+    /** Listens for actions apon the 'set default subindex' button in the SubcollectionManager controls, and if detected calls the setDefaultSubIndex method of the manager with the SubIndex selected for default. */
+    private class SetDefaultListener
+        implements ActionListener {
                 /** Any implementation of ActionListener must include this method so we can be informed when an action has been performed on one of our target controls. In this case we want to check if they have a subindex selected, and if so set it as default.
                  * @param event An <strong>ActionEvent</strong> containing information about the event.
 …
                  * @see org.greenstone.gatherer.cdm.SubIndex
                  */
                 public void actionPerformed(ActionEvent event) {
                      if(!subindexes_list.isSelectionEmpty()) {
                           setDefaultSubIndex(new DefaultSubIndex((SubIndex)subindexes_list.getSelectedValue()));
                           clear_default.setEnabled(true);
                           default_value.setText(default_index.getSubIndex().toString());
+                     }
+                }
+          }
+     }
+        public void actionPerformed(ActionEvent event) {
+        if(!subindexes_list.isSelectionEmpty()) {
+            setDefaultSubIndex(new DefaultSubIndex((SubIndex)subindexes_list.getSelectedValue()));
+            clear_default.setEnabled(true);
+            default_value.setText(default_index.getSubIndex().toString());
+        }
+        }
+    }
+    }
+}

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

-              r4293
+              r4366
 import org.greenstone.gatherer.cdm.LanguageManager;
 /** This class provides a graphical interface to allow a user to quickly and conviently (ie all in one place) translate the text fragments associated with general metadata and indexes into each of the assigned languages in the collection. It should provide clear controls for the editing of these text fragments, plus clear indicate what languages still need further translation, which it will do through a combination of coloring and other visual indicators.
 * @author John Thompson, Greenstone Digital Library, University of Waikato
 * @version 2.3
 */
+ * @author John Thompson, Greenstone Digital Library, University of Waikato
+ * @version 2.3
+ */
 public class TranslationManager
      extends JDialog {
     /** A reference to our creator, the CollectionDesignManager. */
      private CollectionDesignManager manager = null;
     /** The currently selected collection metadata. */
      private CollectionMeta current = null;
     /** A listener for selection changes in the feature list. */
      private FeatureListener features_listener = null;
     /** A reference to the Gatherer, for access to the Dictionary and messaging purposes. */
      private Gatherer gatherer = null;
     /** The button used to close the translation dialog. */
      private JButton close_button = null;
     /** A reference to the dialog so that our inner classes can interact with it. */
     private JDialog dialog = null;
     /** The label denoting the features list. */
     private JLabel features_label = null;
     /** The label denoting the language table. */
     private JLabel languages_label = null;
     /** The label denoting the original text area. */
     private JLabel original_label = null;
     /** The label denoting the original language field */
     private JLabel original_language_label = null;
     /** The label denoting the translated text area. */
     private JLabel translation_label = null;
     /** The label denoting the translated language field. */
     private JLabel translation_language_label = null;
     /** A list of the various features that have collection metadata associated with them. */
     private JList features_list = null;
     /** The base panel. */
     private JPanel content_pane = null;
     /** The right panel. */
     private JPanel control_pane = null;
     /** The panel the features list is shown in. */
     private JPanel features_pane = null;
     /** The panel the languages table is shown in. */
     private JPanel languages_pane = null;
     /** The panel the original text is shown in. */
     private JPanel original_pane = null;
     /** The panel the original language field is shown in. */
     private JPanel original_header_pane = null;
     /** The panel the translation text is shown in. */
     private JPanel translation_pane = null;
     /** The panel the translation language field is shown in. */
     private JPanel translation_header_pane = null;
     /** The table used to show the languages supported by the collection. */
     private JTable languages_table = null;
     /** The text area displaying the original text (in the default language). */
     private JTextArea original = null;
      /** The text area displaying the translated text (in the selected language). */
      private JTextArea translation = null;
     /** The language currently selected. */
     private Language current_language = null;
     /** The proxy model to the language manager which serves as the basis for the table. */
     private TableProxy languages_model = null;
     /** The default size of the features list. */
     static final private Dimension FEATURE_SIZE = new Dimension(200, 400);
     /** The default size of the translation dialog. */
     static final private Dimension SIZE = new Dimension(800, 450);
     /** Constructor.
     * @param gatherer A reference to the <strong>Gatherer</strong>.
     * @param manager A reference to the <strong>CollectionDesignManager</strong>.
     * @see org.greenstone.gatherer.Configuration
     * @see org.greenstone.gatherer.cdm.CollectionMeta
     * @see org.greenstone.gatherer.cdm.TranslationManager.TableProxy
     */
      public TranslationManager(Gatherer gatherer, CollectionDesignManager manager) {
           super();
           this.dialog = this;
           this.gatherer = gatherer;
           this.manager = manager;
           this.languages_model = new TableProxy();
           // Create the features model. Basically we want one string entry for each unique name in the metadata.
           ArrayList features_model = new ArrayList();
           for(int i = 0; i < manager.collectionmetadatum.size(); i++) {
                 CollectionMeta metadata = (CollectionMeta) manager.collectionmetadatum.get(i);
                 Object object = metadata.getName();
                 String name = null;
                 if(object instanceof Index) {
                      name = ((Index)object).toString(false);
+                }
                 else {
                      name = object.toString();
+                }
                 if(!features_model.contains(name)) {
                      features_model.add(name);
+                }
+          }
           Collections.sort(features_model);
           // Create components...
           setModal(true);
           setSize(SIZE);
           close_button = new JButton(get("General.Close"));
           content_pane = (JPanel) getContentPane();
           control_pane = new JPanel();
           features_label = new JLabel(get("Affected_Features"));
           features_label.setHorizontalAlignment(JLabel.CENTER);
           features_list = new JList(features_model.toArray());
           features_listener = new FeatureListener();
           features_pane = new JPanel();
           features_pane.setPreferredSize(FEATURE_SIZE);
           languages_table = new JTable(languages_model);
           languages_table.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
           languages_label = new JLabel(get("Assigned_Languages"));
           languages_label.setHorizontalAlignment(JLabel.CENTER);
           languages_pane = new JPanel();
           original = new JTextArea();
           original.setBackground(Gatherer.config.getColor("coloring.collection_tree_background", false));
           original.setEditable(false);
           original.setFont(new Font("Arial Unicode MS", Font.PLAIN, 10));
           original_header_pane = new JPanel();
           original_label = new JLabel(get("Default_Text"));
           original_label.setHorizontalAlignment(JLabel.CENTER);
           original_language_label = new JLabel("");
           original_pane = new JPanel();
           translation = new JTextArea();
           translation.setEnabled(false);
           translation.setFont(new Font("Arial Unicode MS", Font.PLAIN, 10));
           translation_header_pane = new JPanel();
           translation_label = new JLabel(get("Translation"));
           translation_label.setHorizontalAlignment(JLabel.CENTER);
           translation_language_label = new JLabel("");
           translation_pane = new JPanel();
           // Add listeners...
           close_button.addActionListener(new CloseListener());
           translation.addKeyListener(new TranslationListener());
           features_list.addListSelectionListener(features_listener);
           features_list.addListSelectionListener(languages_model);
           ListSelectionModel languages_selection_model = languages_table.getSelectionModel();
           languages_selection_model.addListSelectionListener(new TableListener());
           // Layout...
           features_pane.setBorder(BorderFactory.createEmptyBorder(0,0,0,5));
           features_pane.setLayout(new BorderLayout());
           features_pane.add(features_label, BorderLayout.NORTH);
           features_pane.add(new JScrollPane(features_list), BorderLayout.CENTER);
           languages_label.setBorder(BorderFactory.createEmptyBorder(5,0,5,0));
           languages_pane.setLayout(new BorderLayout());
           languages_pane.add(languages_label, BorderLayout.NORTH);
           languages_pane.add(new JScrollPane(languages_table), BorderLayout.CENTER);
           original_header_pane.setBorder(BorderFactory.createEmptyBorder(5,0,5,0));
           original_header_pane.setLayout(new BorderLayout());
           original_header_pane.add(original_label, BorderLayout.WEST);
           original_header_pane.add(original_language_label, BorderLayout.EAST);
           original_pane.setLayout(new BorderLayout());
           original_pane.add(original_header_pane, BorderLayout.NORTH);
           original_pane.add(new JScrollPane(original), BorderLayout.CENTER);
           translation_header_pane.setBorder(BorderFactory.createEmptyBorder(5,0,5,0));
           translation_header_pane.setLayout(new BorderLayout());
           translation_header_pane.add(translation_label, BorderLayout.WEST);
           translation_header_pane.add(translation_language_label, BorderLayout.EAST);
           translation_pane.setLayout(new BorderLayout());
           translation_pane.add(translation_header_pane, BorderLayout.NORTH);
           translation_pane.add(new JScrollPane(translation), BorderLayout.CENTER);
           control_pane.setLayout(new GridLayout(3,1));
           control_pane.add(languages_pane);
           control_pane.add(original_pane);
           control_pane.add(translation_pane);
           content_pane.setBorder(BorderFactory.createEmptyBorder(5,5,5,5));
           content_pane.setLayout(new BorderLayout());
           content_pane.add(features_pane, BorderLayout.WEST);
           content_pane.add(control_pane, BorderLayout.CENTER);
           content_pane.add(close_button, BorderLayout.SOUTH);
           // Display...
           Dimension screen_size = Toolkit.getDefaultToolkit().getScreenSize();
           for (int i = 0; i < languages_model.getColumnCount() - 1; i++) {
                 TableColumn column = languages_table.getColumnModel().getColumn(i);
                 column.setMinWidth(0);
                 column.setMaxWidth(screen_size.width);
                 column.setPreferredWidth((SIZE.width - FEATURE_SIZE.width) / 6);
+          }
           setLocation((screen_size.width - SIZE.width) / 2, (screen_size.height - SIZE.height) / 2);
           show();
+     }
      /** Destructor
+    extends JDialog {
+    /** A reference to our creator, the CollectionDesignManager. */
+    private CollectionDesignManager manager = null;
+    /** The currently selected collection metadata. */
+    private CollectionMeta current = null;
+    /** A listener for selection changes in the feature list. */
+    private FeatureListener features_listener = null;
+    /** A reference to the Gatherer, for access to the Dictionary and messaging purposes. */
+    private Gatherer gatherer = null;
+    /** The button used to close the translation dialog. */
+    private JButton close_button = null;
+    /** A reference to the dialog so that our inner classes can interact with it. */
+    private JDialog dialog = null;
+    /** The label denoting the features list. */
+    private JLabel features_label = null;
+    /** The label denoting the language table. */
+    private JLabel languages_label = null;
+    /** The label denoting the original text area. */
+    private JLabel original_label = null;
+    /** The label denoting the original language field */
+    private JLabel original_language_label = null;
+    /** The label denoting the translated text area. */
+    private JLabel translation_label = null;
+    /** The label denoting the translated language field. */
+    private JLabel translation_language_label = null;
+    /** A list of the various features that have collection metadata associated with them. */
+    private JList features_list = null;
+    /** The base panel. */
+    private JPanel content_pane = null;
+    /** The right panel. */
+    private JPanel control_pane = null;
+    /** The panel the features list is shown in. */
+    private JPanel features_pane = null;
+    /** The panel the languages table is shown in. */
+    private JPanel languages_pane = null;
+    /** The panel the original text is shown in. */
+    private JPanel original_pane = null;
+    /** The panel the original language field is shown in. */
+    private JPanel original_header_pane = null;
+    /** The panel the translation text is shown in. */
+    private JPanel translation_pane = null;
+    /** The panel the translation language field is shown in. */
+    private JPanel translation_header_pane = null;
+    /** The table used to show the languages supported by the collection. */
+    private JTable languages_table = null;
+    /** The text area displaying the original text (in the default language). */
+    private JTextArea original = null;
+    /** The text area displaying the translated text (in the selected language). */
+    private JTextArea translation = null;
+    /** The language currently selected. */
+    private Language current_language = null;
+    /** The proxy model to the language manager which serves as the basis for the table. */
+    private TableProxy languages_model = null;
+    /** The default size of the features list. */
+    static final private Dimension FEATURE_SIZE = new Dimension(200, 400);
+    /** The default size of the translation dialog. */
+    static final private Dimension SIZE = new Dimension(800, 450);
+    /** Constructor.
+     * @param gatherer A reference to the <strong>Gatherer</strong>.
+     * @param manager A reference to the <strong>CollectionDesignManager</strong>.
+     * @see org.greenstone.gatherer.Configuration
+     * @see org.greenstone.gatherer.cdm.CollectionMeta
+     * @see org.greenstone.gatherer.cdm.TranslationManager.TableProxy
+     */
+    public TranslationManager(Gatherer gatherer, CollectionDesignManager manager) {
+    super();
+    this.dialog = this;
+    this.gatherer = gatherer;
+    this.manager = manager;
+    this.languages_model = new TableProxy();
+    // Create the features model. Basically we want one string entry for each unique name in the metadata.
+    ArrayList features_model = new ArrayList();
+    for(int i = 0; i < manager.collectionmetadatum.size(); i++) {
+        CollectionMeta metadata = (CollectionMeta) manager.collectionmetadatum.get(i);
+        Object object = metadata.getName();
+        String name = null;
+        if(object instanceof Index) {
+        name = ((Index)object).toString(false);
+        }
+        else {
+        name = object.toString();
+        }
+        if(!features_model.contains(name)) {
+        features_model.add(name);
+        }
+    }
+    Collections.sort(features_model);
+    // Create components...
+    setModal(true);
+    setSize(SIZE);
+    close_button = new JButton(get("General.Close"));
+    content_pane = (JPanel) getContentPane();
+    control_pane = new JPanel();
+    features_label = new JLabel(get("Affected_Features"));
+    features_label.setHorizontalAlignment(JLabel.CENTER);
+    features_list = new JList(features_model.toArray());
+    features_listener = new FeatureListener();
+    features_pane = new JPanel();
+    features_pane.setPreferredSize(FEATURE_SIZE);
+    languages_table = new JTable(languages_model);
+    languages_table.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
+    languages_label = new JLabel(get("Assigned_Languages"));
+    languages_label.setHorizontalAlignment(JLabel.CENTER);
+    languages_pane = new JPanel();
+    original = new JTextArea();
+    original.setBackground(Gatherer.config.getColor("coloring.collection_tree_background", false));
+    original.setEditable(false);
+    original.setFont(new Font("Arial Unicode MS", Font.PLAIN, 10));
+    original_header_pane = new JPanel();
+    original_label = new JLabel(get("Default_Text"));
+    original_label.setHorizontalAlignment(JLabel.CENTER);
+    original_language_label = new JLabel("");
+    original_pane = new JPanel();
+    translation = new JTextArea();
+    translation.setEnabled(false);
+    translation.setFont(new Font("Arial Unicode MS", Font.PLAIN, 10));
+    translation_header_pane = new JPanel();
+    translation_label = new JLabel(get("Translation"));
+    translation_label.setHorizontalAlignment(JLabel.CENTER);
+    translation_language_label = new JLabel("");
+    translation_pane = new JPanel();
+    // Add listeners...
+    close_button.addActionListener(new CloseListener());
+    translation.addKeyListener(new TranslationListener());
+    features_list.addListSelectionListener(features_listener);
+    features_list.addListSelectionListener(languages_model);
+    ListSelectionModel languages_selection_model = languages_table.getSelectionModel();
+    languages_selection_model.addListSelectionListener(new TableListener());
+    // Layout...
+    features_pane.setBorder(BorderFactory.createEmptyBorder(0,0,0,5));
+    features_pane.setLayout(new BorderLayout());
+    features_pane.add(features_label, BorderLayout.NORTH);
+    features_pane.add(new JScrollPane(features_list), BorderLayout.CENTER);
+    languages_label.setBorder(BorderFactory.createEmptyBorder(5,0,5,0));
+    languages_pane.setLayout(new BorderLayout());
+    languages_pane.add(languages_label, BorderLayout.NORTH);
+    languages_pane.add(new JScrollPane(languages_table), BorderLayout.CENTER);
+    original_header_pane.setBorder(BorderFactory.createEmptyBorder(5,0,5,0));
+    original_header_pane.setLayout(new BorderLayout());
+    original_header_pane.add(original_label, BorderLayout.WEST);
+    original_header_pane.add(original_language_label, BorderLayout.EAST);
+    original_pane.setLayout(new BorderLayout());
+    original_pane.add(original_header_pane, BorderLayout.NORTH);
+    original_pane.add(new JScrollPane(original), BorderLayout.CENTER);
+    translation_header_pane.setBorder(BorderFactory.createEmptyBorder(5,0,5,0));
+    translation_header_pane.setLayout(new BorderLayout());
+    translation_header_pane.add(translation_label, BorderLayout.WEST);
+    translation_header_pane.add(translation_language_label, BorderLayout.EAST);
+    translation_pane.setLayout(new BorderLayout());
+    translation_pane.add(translation_header_pane, BorderLayout.NORTH);
+    translation_pane.add(new JScrollPane(translation), BorderLayout.CENTER);
+    control_pane.setLayout(new GridLayout(3,1));
+    control_pane.add(languages_pane);
+    control_pane.add(original_pane);
+    control_pane.add(translation_pane);
+    content_pane.setBorder(BorderFactory.createEmptyBorder(5,5,5,5));
+    content_pane.setLayout(new BorderLayout());
+    content_pane.add(features_pane, BorderLayout.WEST);
+    content_pane.add(control_pane, BorderLayout.CENTER);
+    content_pane.add(close_button, BorderLayout.SOUTH);
+    // Display...
+    Dimension screen_size = Toolkit.getDefaultToolkit().getScreenSize();
+    for (int i = 0; i < languages_model.getColumnCount() - 1; i++) {
+        TableColumn column = languages_table.getColumnModel().getColumn(i);
+        column.setMinWidth(0);
+        column.setMaxWidth(screen_size.width);
+        column.setPreferredWidth((SIZE.width - FEATURE_SIZE.width) / 6);
+    }
+    setLocation((screen_size.width - SIZE.width) / 2, (screen_size.height - SIZE.height) / 2);
+    show();
+    }
+    /** Destructor
       */
      public void destroy() {
           dialog = null;
+     }
      /** Retrieve a phrase from the dictionary based on a certain key.
+    public void destroy() {
+    dialog = null;
+    }
+    /** Retrieve a phrase from the dictionary based on a certain key.
       * @param key The search <strong>String</strong>.
       * @return The matching phrase from the Dictionary as a <strong>String</strong>.
       */
      private String get(String key) {
           return get(key, null);
+     }
      /** Retrieve a phrase from the dictionary based on a certain key and certain arguments.
+    private String get(String key) {
+    return get(key, null);
+    }
+    /** Retrieve a phrase from the dictionary based on a certain key and certain arguments.
       * @param key The search <strong>String</strong>.
       * @param args A <strong>String[]</strong> used to complete and format the returned phrase.
 …
       * @see org.greenstone.gatherer.Gatherer
       */
      private String get(String key, String args[]) {
           if(key.indexOf(".") == -1) {
                 key = "CDM.TranslationManager." + key;
+          }
           return gatherer.dictionary.get(key, args);
+     }
      /** Listens for actions apon the close button. */
      private class CloseListener
           implements ActionListener {
           /** Closes the dialog. Any implementation of an ActionListener must include this method so we can be informed when an action has occured.
             * @param event An <Strong>ActionEvent</strong> containing details about the action.
             */
           public void actionPerformed(ActionEvent event) {
                 dialog.dispose();
+          }
+     }
      /** Listens to selections within the feature list. */
      private class FeatureListener
           implements ListSelectionListener {
         /** Called whenever the selection changes in the registered list, which requires us to create a new TableProxy.
         * @param event A <strong>ListSelectionEvent</strong> containing more information about the list selection change.
         * @see org.greenstone.gatherer.cdm.CollectionMeta
         * @see org.greenstone.gatherer.cdm.Language
         */
           public void valueChanged(ListSelectionEvent event) {
+    private String get(String key, String args[]) {
+    if(key.indexOf(".") == -1) {
+        key = "CDM.TranslationManager." + key;
+    }
+    return gatherer.dictionary.get(key, args);
+    }
+    /** Listens for actions apon the close button. */
+    private class CloseListener
+    implements ActionListener {
+    /** Closes the dialog. Any implementation of an ActionListener must include this method so we can be informed when an action has occured.
+     * @param event An <Strong>ActionEvent</strong> containing details about the action.
+            */
+    public void actionPerformed(ActionEvent event) {
+        dialog.dispose();
+    }
+    }
+    /** Listens to selections within the feature list. */
+    private class FeatureListener
+    implements ListSelectionListener {
+    /** Called whenever the selection changes in the registered list, which requires us to create a new TableProxy.
+     * @param event A <strong>ListSelectionEvent</strong> containing more information about the list selection change.
+     * @see org.greenstone.gatherer.cdm.CollectionMeta
+     * @see org.greenstone.gatherer.cdm.Language
+     */
+    public void valueChanged(ListSelectionEvent event) {
                 // Try to find the default language value for this feature.
                 String name = (String) features_list.getSelectedValue();
                 Language language = manager.languages.getDefaultLanguage();
                 CollectionMeta metadata = manager.collectionmetadatum.getMetadata(name, language, true);
                 if(metadata != null && metadata.getValue() != null && metadata.getValue().length() != 0) {
                      if(!metadata.getLanguage().equals(language)) {
                           original_label.setText(get("Existing_Text"));
+                     }
                      else {
                           original_label.setText(get("Default_Text"));
+                     }
                      original.setText(metadata.getValue());
                      original_language_label.setText(metadata.getLanguage().toString());
+                }
                 else {
                      original_label.setText(get("No_Text"));
                      original.setText("");
+                }
+          }
+     }
      /** Listens for selections within the languages table. */
      private class TableListener
           implements ListSelectionListener {
         /** Called whenever the selection changes in the registered list, which requires us to update several parts of the dialog.
         * @param event A <strong>ListSelectionEvent</strong> containing more information about the list selection change.
         * @see org.greenstone.gatherer.cdm.CollectionMeta
         * @see org.greenstone.gatherer.cdm.Language
         */
           public void valueChanged(ListSelectionEvent event) {
                 if (event.getValueIsAdjusting()) return;
                 ListSelectionModel lsm = (ListSelectionModel)event.getSource();
                 if (!lsm.isSelectionEmpty()) {
                      int row = lsm.getMinSelectionIndex();
                      current = languages_model.getMetadata(row);
                      if(current != null) {
                           if (current.getValue() != null) {
                                 translation.setText(current.getValue());
+                          }
                           else {
                                 translation.setText("");
+                          }
                           current_language = current.getLanguage();
+                     }
                      else {
                           current_language = (Language) languages_model.getValueAt(row, 1);
                           translation.setText("");
+                     }
                      features_listener.valueChanged(null);
                      translation_language_label.setText(current_language.toString());
                      translation.setEnabled(true);
+                }
+          }
+     }
      /** A AbstractTableModel extension based upon a vector of CollectionMeta, which can also listen to a list for selection changes. */
      private class TableProxy
           extends AbstractTableModel
           implements ListSelectionListener {
             /** Called when the contents of a cell changes.
             */
           public void cellChanged() {
                 fireTableDataChanged();
+          }
           /** Returns the most specific superclass for all the cell values in the column.
+        String name = (String) features_list.getSelectedValue();
+        Language language = manager.languages.getDefaultLanguage();
+        CollectionMeta metadata = manager.collectionmetadatum.getMetadata(name, language, true);
+        if(metadata != null && metadata.getValue() != null && metadata.getValue().length() != 0) {
+        if(!metadata.getLanguage().equals(language)) {
+            original_label.setText(get("Existing_Text"));
+        }
+        else {
+            original_label.setText(get("Default_Text"));
+        }
+        original.setText(metadata.getValue());
+        original_language_label.setText(metadata.getLanguage().toString());
+        }
+        else {
+        original_label.setText(get("No_Text"));
+        original.setText("");
+        }
+    }
+    }
+    /** Listens for selections within the languages table. */
+    private class TableListener
+    implements ListSelectionListener {
+    /** Called whenever the selection changes in the registered list, which requires us to update several parts of the dialog.
+     * @param event A <strong>ListSelectionEvent</strong> containing more information about the list selection change.
+     * @see org.greenstone.gatherer.cdm.CollectionMeta
+     * @see org.greenstone.gatherer.cdm.Language
+     */
+    public void valueChanged(ListSelectionEvent event) {
+        if (event.getValueIsAdjusting()) return;
+        ListSelectionModel lsm = (ListSelectionModel)event.getSource();
+        if (!lsm.isSelectionEmpty()) {
+        int row = lsm.getMinSelectionIndex();
+        current = languages_model.getMetadata(row);
+        if(current != null) {
+            if (current.getValue() != null) {
+            translation.setText(current.getValue());
+            }
+            else {
+            translation.setText("");
+            }
+            current_language = current.getLanguage();
+        }
+        else {
+            current_language = (Language) languages_model.getValueAt(row, 1);
+            translation.setText("");
+        }
+        features_listener.valueChanged(null);
+        translation_language_label.setText(current_language.toString());
+        translation.setEnabled(true);
+        }
+    }
+    }
+    /** A AbstractTableModel extension based upon a vector of CollectionMeta, which can also listen to a list for selection changes. */
+    private class TableProxy
+    extends AbstractTableModel
+    implements ListSelectionListener {
+    /** Called when the contents of a cell changes.
+     */
+    public void cellChanged() {
+        fireTableDataChanged();
+    }
+    /** Returns the most specific superclass for all the cell values in the column.
             * @param column An <i>int</i> specifying which columns class to be determined.
             * @return The columns <strong>Class</strong>.
             */
         public Class getColumnClass(int column) {
                 return String.class;
+          }
           /** Returns the number of columns in the model.
+        return String.class;
+    }
+    /** Returns the number of columns in the model.
             * @return An <i>int</i> specifying the number of columns.
             */
           public int getColumnCount() {
                 if(!features_list.isSelectionEmpty()) {
                      return 2;
+                }
                 return 0;
+          }
+    public int getColumnCount() {
+        if(!features_list.isSelectionEmpty()) {
+        return 2;
+        }
+        return 0;
+    }
         /** Returns the name of the column at columnIndex.
             * @param column An <i>int</i> specifying the column whose name you are interesting in.
             * @return The name of the column as a <strong>String</strong>.
             */
           public String getColumnName(int column) {
                 String name = null;
                 switch(column) {
                 case 0:
                      name = get("Language");
                      break;
                 case 1:
                      name = get("Text");
                      break;
+                }
                 return name;
+          }
           /** Retrieve the collection metadata from the specified row.
+    public String getColumnName(int column) {
+        String name = null;
+        switch(column) {
+        case 0:
+        name = get("Language");
+        break;
+        case 1:
+        name = get("Text");
+        break;
+        }
+        return name;
+    }
+    /** Retrieve the collection metadata from the specified row.
           * @param row An <i>int</i> indicating the row in question.
           * @see org.greenstone.gatherer.cdm.Language
           * @see org.greenstone.gatherer.cdm.LanguageManager
           */
           public CollectionMeta getMetadata(int row) {
                 String name = (String) features_list.getSelectedValue();
                 Language language = (Language) getValueAt(row, 0);
                 return manager.collectionmetadatum.getMetadata(name, language, false);
+          }
+    public CollectionMeta getMetadata(int row) {
+        String name = (String) features_list.getSelectedValue();
+        Language language = (Language) getValueAt(row, 0);
+        return manager.collectionmetadatum.getMetadata(name, language, false);
+    }
         /** Returns the number of rows in the model.
             * @return An <i>int</i> specifying the number of rows in the table, which is exactly the number of languages assigned to this collection.
             * @see org.greenstone.gatherer.cdm.LanguageManager
             */
           public int getRowCount() {
                 return manager.languages.size();
+          }
           /** Returns the value for the cell at column and row.
+    public int getRowCount() {
+        return manager.languages.size();
+    }
+    /** Returns the value for the cell at column and row.
             * @param row The desired row as an <i>int</i>.
             * @param column The desired column as an <i>int</i>.
 …
             * @see org.greenstone.gatherer.cdm.LanguageManager
             */
           public Object getValueAt(int row, int column) {
                 if(!features_list.isSelectionEmpty()) {
                      // First of all find the Language that matches the row and the current feature name, because in any case you'll need them.
                      Language language = (Language)manager.languages.get(row);
                      String feature_name = (String)features_list.getSelectedValue();
                      // Also try to locate the collection level metadata that matches.
                      CollectionMeta metadata = manager.collectionmetadatum.getMetadata(feature_name, language, false);
                      // Now we do subtly different things depending on the column.
                      switch(column) {
                      case 0: // The Language. Easiest case.
                           return language;
                      case 1: // The value of the metadata. Needs us to retrieve the value for a certain feature and language.
                           if(metadata != null) {
                                 return metadata.getValue();
+                          }
+                     }
                      // If all else fails, return an empty string and hope the class caster doesn't explode.
+                }
                 return "";
+          }
+    public Object getValueAt(int row, int column) {
+        if(!features_list.isSelectionEmpty()) {
+        // First of all find the Language that matches the row and the current feature name, because in any case you'll need them.
+        Language language = (Language)manager.languages.get(row);
+        String feature_name = (String)features_list.getSelectedValue();
+        // Also try to locate the collection level metadata that matches.
+        CollectionMeta metadata = manager.collectionmetadatum.getMetadata(feature_name, language, false);
+        // Now we do subtly different things depending on the column.
+        switch(column) {
+        case 0: // The Language. Easiest case.
+            return language;
+        case 1: // The value of the metadata. Needs us to retrieve the value for a certain feature and language.
+            if(metadata != null) {
+            return metadata.getValue();
+            }
+        }
+        // If all else fails, return an empty string and hope the class caster doesn't explode.
+        }
+        return "";
+    }
         /** Returns true if the cell at row and column is editable.
             * @param row The row of the cell as an <i>int</i>.
             * @param column The column of the cell also as an <i>int</i>.
             */
           public boolean isCellEditable(int rowIndex, int columnIndex) {
                 return false;
+          }
+    public boolean isCellEditable(int rowIndex, int columnIndex) {
+        return false;
+    }
         /** Sets the value in the cell at columnIndex and rowIndex to aValue.
             */
           public void setValueAt(Object aValue, int rowIndex, int columnIndex) {
+          }
           /** Any implementation of <i>ListSelectionListener</i> must include this method so we can be informed when the list selection has changed.
+    public void setValueAt(Object aValue, int rowIndex, int columnIndex) {
+    }
+    /** Any implementation of <i>ListSelectionListener</i> must include this method so we can be informed when the list selection has changed.
             * @param event A <strong>ListSelectionEvent</strong> containing information about the selection change.
             */
           public void valueChanged(ListSelectionEvent event) {
                 fireTableStructureChanged();
+          }
+     }
      /** This provides a custom renderer that colours the background of the default language cell green, and the foreground of currently unready metadata rows red. */
      private class TableRenderer
           extends DefaultTableCellRenderer {
           /** Retrieve the component used to rubberstamp the table based on the given parameters.
           * @param table The <strong>JTable</strong> to rendered.
           * @param value The <strong>Object</strong> whose representation will be shown in the table row.
           * @param isSelected <i>true</i> iff the column/row is selected.
           * @param hasFocus <i>true</i> iff the column/row is in focus.
           * @param row An <i>int</i> specifying the target row.
           * @param column An <i>int</i> specifying the target column.
           * @see org.greenstone.gatherer.cdm.Language
           */
           public Component getTableCellRendererComponent(JTable table, Object value, boolean isSelected, boolean hasFocus, int row, int column) {
                 Component component = null;
+    public void valueChanged(ListSelectionEvent event) {
+        fireTableStructureChanged();
+    }
+    }
+    /** This provides a custom renderer that colours the background of the default language cell green, and the foreground of currently unready metadata rows red. */
+    private class TableRenderer
+    extends DefaultTableCellRenderer {
+    /** Retrieve the component used to rubberstamp the table based on the given parameters.
+     * @param table The <strong>JTable</strong> to rendered.
+     * @param value The <strong>Object</strong> whose representation will be shown in the table row.
+     * @param isSelected <i>true</i> iff the column/row is selected.
+     * @param hasFocus <i>true</i> iff the column/row is in focus.
+     * @param row An <i>int</i> specifying the target row.
+     * @param column An <i>int</i> specifying the target column.
+     * @see org.greenstone.gatherer.cdm.Language
+     */
+    public Component getTableCellRendererComponent(JTable table, Object value, boolean isSelected, boolean hasFocus, int row, int column) {
+        Component component = null;
                 // Create the component.
                 if(value instanceof String || value instanceof Language) {
                      JLabel label = new JLabel(value.toString());
                      label.setOpaque(true);
                      component = label;
+                }
                 else {
                      JCheckBox check = new JCheckBox("", ((Boolean)value).booleanValue());
                      JPanel pane = new JPanel(new BorderLayout());
                      pane.add(check, BorderLayout.CENTER);
                      component = pane;
+                }
+        if(value instanceof String || value instanceof Language) {
+        JLabel label = new JLabel(value.toString());
+        label.setOpaque(true);
+        component = label;
+        }
+        else {
+        JCheckBox check = new JCheckBox("", ((Boolean)value).booleanValue());
+        JPanel pane = new JPanel(new BorderLayout());
+        pane.add(check, BorderLayout.CENTER);
+        component = pane;
+        }
                 // Check for default property
                 Language language = (Language)languages_model.getValueAt(row, 1);
                 if(language.isDefault()) {
                      if(isSelected) {
                           component.setBackground(Gatherer.config.getColor("coloring.collection_selection_background", false));
+                     }
                      else {
                           component.setBackground(Gatherer.config.getColor("coloring.collection_tree_background", false));
+                     }
+                }
                 else {
                      if(isSelected) {
                           component.setBackground(table.getSelectionBackground());
+                     }
                      else {
                           component.setForeground(Color.white);
+                     }
+                }
+        Language language = (Language)languages_model.getValueAt(row, 1);
+        if(language.isDefault()) {
+        if(isSelected) {
+            component.setBackground(Gatherer.config.getColor("coloring.collection_selection_background", false));
+        }
+        else {
+            component.setBackground(Gatherer.config.getColor("coloring.collection_tree_background", false));
+        }
+        }
+        else {
+        if(isSelected) {
+            component.setBackground(table.getSelectionBackground());
+        }
+        else {
+            component.setForeground(Color.white);
+        }
+        }
                 // Check for readiness
                 Boolean ready = (Boolean)languages_model.getValueAt(row, 0);
                 if(!ready.booleanValue()) {
                      component.setForeground(Color.red);
+                }
                 else {
                      component.setForeground(Color.black);
+                }
                 return component;
+          }
+     }
     /** Listens for actions within the translation text field and immediately updates the collection metadata as necessary. */
      private class TranslationListener
           extends KeyAdapter {
          /** This method is called when a key has been released, and is perfect for us to synchronize the contents of the translation field with the collection metadata associated with the selected feature and language.
          * @param event A <strong>KeyEvent</strong> containing more detail about the key released.
          * @see org.greenstone.gatherer.cdm.CollectionMeta
          * @see org.greenstone.gatherer.cdm.CollectionMetaManager
          * @see org.greenstone.gatherer.cdm.Index
          */
           public void keyReleased(KeyEvent event) {
                 if(current == null) {
                      String name = (String)features_list.getSelectedValue();
                      Index index = manager.indexes.getIndex(name);
                      if(index == null) {
                           current = new CollectionMeta(manager, name, current_language, translation.getText());
+                     }
                      else {
                           current = new CollectionMeta(manager, index, current_language, translation.getText());
+                     }
                      manager.collectionmetadatum.addMetadata(current);
+                }
                 else {
                      current.update(current.getName(), current.getLanguage(), translation.getText());
+                }
                 languages_model.cellChanged();
+          }
+     }
+        Boolean ready = (Boolean)languages_model.getValueAt(row, 0);
+        if(!ready.booleanValue()) {
+        component.setForeground(Color.red);
+        }
+        else {
+        component.setForeground(Color.black);
+        }
+        return component;
+    }
+    }
+    /** Listens for actions within the translation text field and immediately updates the collection metadata as necessary. */
+    private class TranslationListener
+    extends KeyAdapter {
+    /** This method is called when a key has been released, and is perfect for us to synchronize the contents of the translation field with the collection metadata associated with the selected feature and language.
+     * @param event A <strong>KeyEvent</strong> containing more detail about the key released.
+     * @see org.greenstone.gatherer.cdm.CollectionMeta
+     * @see org.greenstone.gatherer.cdm.CollectionMetaManager
+     * @see org.greenstone.gatherer.cdm.Index
+     */
+    public void keyReleased(KeyEvent event) {
+        if(current == null) {
+        String name = (String)features_list.getSelectedValue();
+        Index index = manager.indexes.getIndex(name);
+        if(index == null) {
+            current = new CollectionMeta(manager, name, current_language, translation.getText());
+        }
+        else {
+            current = new CollectionMeta(manager, index, current_language, translation.getText());
+        }
+        manager.collectionmetadatum.addMetadata(current);
+        }
+        else {
+        current.update(current.getName(), current.getLanguage(), translation.getText());
+        }
+        languages_model.cellChanged();
+    }
+    }
+}

trunk/gli/src/org/greenstone/gatherer/checklist/CheckList.java

-              r4293
+              r4366
 // ####################################################################################
 public class CheckList
      extends JList {
      /** The border used when a list row is not in focus. */
      protected static Border noFocusBorder = new EmptyBorder(1, 1, 1, 1);
      /** Constructor. */
      public CheckList() {
           super();
           setCellRenderer(new CellRenderer());
           setModel(new DefaultListModel());
           setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
           addMouseListener(new CheckListListener());
+     }
      /** Constructor.
+    extends JList {
+    /** The border used when a list row is not in focus. */
+    protected static Border noFocusBorder = new EmptyBorder(1, 1, 1, 1);
+    /** Constructor. */
+    public CheckList() {
+    super();
+    setCellRenderer(new CellRenderer());
+    setModel(new DefaultListModel());
+    setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
+    addMouseListener(new CheckListListener());
+    }
+    /** Constructor.
       * @param list_data An <strong>ArrayList</strong> of entries for this checklist.
       * @see org.greenstone.gatherer.checklist.CheckList.Entry
       */
      public CheckList(ArrayList list_data) {
           super();
           // Create a new model.
           DefaultListModel model = new DefaultListModel();
           for(int i = 0; i < list_data.size(); i++) {
                 Entry entry = new Entry(list_data.get(i));
                 String name = entry.toString();
                 int index = 0;
                 boolean found = false;
                 while(index < model.size() && !found) {
                      Object sibling = model.getElementAt(index);
                      if(name.compareTo(sibling.toString()) <= 0) {
                           model.add(index, entry);
                           found = true;
+                     }
                      index++;
+                }
                 if(!found) {
                      model.addElement(entry);
+                }
+          }
           setModel(model);
           setCellRenderer(new CellRenderer());
           addMouseListener(new CheckListListener());
           setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
+     }
      /** Constructor. */
      public CheckList(ListModel data_model) {
           super(data_model);
           setCellRenderer(new CellRenderer());
           addMouseListener(new CheckListListener());
           setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
+     }
      public void addEntry(Entry entry) {
           DefaultListModel model = (DefaultListModel) getModel();
           String name = entry.toString();
           int index = 0;
           boolean found = false;
           while(index < model.size() && !found) {
                 Object sibling = model.getElementAt(index);
                 if(name.compareTo(sibling.toString()) <= 0) {
                      model.add(index, entry);
                      found = true;
+                }
                 index++;
                 sibling = null;
+          }
           if(!found) {
                 model.addElement(entry);
+          }
           name = null;
           model = null;
+     }
      public Entry get(int index) {
           DefaultListModel model = (DefaultListModel) getModel();
           return (Entry) model.get(index);
+     }
      /** Retrieve the currently ticked entries from this list.
+    public CheckList(ArrayList list_data) {
+    super();
+    // Create a new model.
+    DefaultListModel model = new DefaultListModel();
+    for(int i = 0; i < list_data.size(); i++) {
+        Entry entry = new Entry(list_data.get(i));
+        String name = entry.toString();
+        int index = 0;
+        boolean found = false;
+        while(index < model.size() && !found) {
+        Object sibling = model.getElementAt(index);
+        if(name.compareTo(sibling.toString()) <= 0) {
+            model.add(index, entry);
+            found = true;
+        }
+        index++;
+        }
+        if(!found) {
+        model.addElement(entry);
+        }
+    }
+    setModel(model);
+    setCellRenderer(new CellRenderer());
+    addMouseListener(new CheckListListener());
+    setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
+    }
+    /** Constructor. */
+    public CheckList(ListModel data_model) {
+    super(data_model);
+    setCellRenderer(new CellRenderer());
+    addMouseListener(new CheckListListener());
+    setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
+    }
+    public void addEntry(Entry entry) {
+    DefaultListModel model = (DefaultListModel) getModel();
+    String name = entry.toString();
+    int index = 0;
+    boolean found = false;
+    while(index < model.size() && !found) {
+        Object sibling = model.getElementAt(index);
+        if(name.compareTo(sibling.toString()) <= 0) {
+        model.add(index, entry);
+        found = true;
+        }
+        index++;
+        sibling = null;
+    }
+    if(!found) {
+        model.addElement(entry);
+    }
+    name = null;
+    model = null;
+    }
+    public Entry get(int index) {
+    DefaultListModel model = (DefaultListModel) getModel();
+    return (Entry) model.get(index);
+    }
+    /** Retrieve the currently ticked entries from this list.
       * @return An <strong>ArrayList</strong> containing only those entries from the initial list that are checked.
       * @see org.greenstone.gatherer.checklist.CheckList.Entry
       */
      public ArrayList getSelected() {
           ArrayList result = new ArrayList();
           DefaultListModel model = (DefaultListModel) getModel();
           int size = model.size();
           for(int i = 0; i < size; i++) {
                 Entry entry = (Entry) model.get(i);
                 if(entry.isSelected()) {
                      result.add(entry.getObject());
+                }
+          }
           return result;
+     }
      public boolean isSelected(int index) {
           DefaultListModel model = (DefaultListModel) getModel();
           Entry entry = (Entry) model.get(index);
           return entry.isSelected();
+     }
      public int getEntryCount() {
           return getModel().getSize();
+     }
      /** Checks the entries in the list whose name appear in the given array.
+    public ArrayList getSelected() {
+    ArrayList result = new ArrayList();
+    DefaultListModel model = (DefaultListModel) getModel();
+    int size = model.size();
+    for(int i = 0; i < size; i++) {
+        Entry entry = (Entry) model.get(i);
+        if(entry.isSelected()) {
+        result.add(entry.getObject());
+        }
+    }
+    return result;
+    }
+    public boolean isSelected(int index) {
+    DefaultListModel model = (DefaultListModel) getModel();
+    Entry entry = (Entry) model.get(index);
+    return entry.isSelected();
+    }
+    public int getEntryCount() {
+    return getModel().getSize();
+    }
+    /** Checks the entries in the list whose name appear in the given array.
       * @param names The name of entries to be checked as a <strong>String[]</strong>.
       * @see org.greenstone.gatherer.checklist.CheckList.Entry
       */
      public void setSelected(String names[]) {
           DefaultListModel model = (DefaultListModel) getModel();
           int size = model.size();
           for(int i = 0; i < size; i++) {
                 Entry entry = (Entry) model.get(i);
                 for(int j = 0; names != null && j < names.length; j++) {
                      if(entry.toString().equals(names[j])) {
                           entry.setSelected(true);
+                     }
+                }
+          }
+     }
      /** A custom list cell renderer for producing rows which contain clickable check boxes. */
      protected class CellRenderer
           implements ListCellRenderer {
           /** Return a component that has been configured to display the specified value. That component's paint method is then called to "render" the cell. If it is necessary to compute the dimensions of a list because the list cells do not have a fixed size, this method is called to generate a component on which getPreferredSize  can be invoked.
             * @param list The </strong>JList</strong> we're painting.
             * @param value The value returned by list.getModel().getElementAt(index), as an <strong>Object</strong>.
             * @param index The cells index as an <i>int</i>.
             * @param is_selected <i>true</i> if the specified cell was selected, <i>false</i> otherwise.
             * @param cell_has_focus <i>true</i> if and only if the specified cell has the focus.
             * @return A <strong>Component</strong> whose paint() method will render the specified value.
+    public void setSelected(String names[]) {
+    DefaultListModel model = (DefaultListModel) getModel();
+    int size = model.size();
+    for(int i = 0; i < size; i++) {
+        Entry entry = (Entry) model.get(i);
+        for(int j = 0; names != null && j < names.length; j++) {
+        if(entry.toString().equals(names[j])) {
+            entry.setSelected(true);
+        }
+        }
+    }
+    }
+    /** A custom list cell renderer for producing rows which contain clickable check boxes. */
+    protected class CellRenderer
+    implements ListCellRenderer {
+    /** Return a component that has been configured to display the specified value. That component's paint method is then called to "render" the cell. If it is necessary to compute the dimensions of a list because the list cells do not have a fixed size, this method is called to generate a component on which getPreferredSize  can be invoked.
+     * @param list The </strong>JList</strong> we're painting.
+     * @param value The value returned by list.getModel().getElementAt(index), as an <strong>Object</strong>.
+     * @param index The cells index as an <i>int</i>.
+     * @param is_selected <i>true</i> if the specified cell was selected, <i>false</i> otherwise.
+     * @param cell_has_focus <i>true</i> if and only if the specified cell has the focus.
+     * @return A <strong>Component</strong> whose paint() method will render the specified value.
             */
           public Component getListCellRendererComponent(JList list, Object value, int index, boolean is_selected, boolean cell_has_focus) {
                 JCheckBox checkbox = (JCheckBox) value;
                 checkbox.setBackground(is_selected ? list.getSelectionBackground() : list.getBackground());
                 checkbox.setForeground(is_selected ? list.getSelectionForeground() : list.getForeground());
                 checkbox.setEnabled(list.isEnabled());
                 checkbox.setFont(list.getFont());
                 checkbox.setFocusPainted(false);
                 checkbox.setBorderPainted(true);
                 checkbox.setBorder((is_selected) ? UIManager.getBorder("List.focusCellHighlightBorder") : noFocusBorder);
                 return checkbox;
+          }
+     }
      /** Listens for clicks apon the checks within the list, and updates as necessary. */
      private class CheckListListener
           extends MouseAdapter {
           private Entry previous_checkbox = null;
           /** Called whenever the mouse is clicked over our list. We find the nearest checkbox and change its state.
             * @param e A <strong>MouseEvent</strong> containing everything you ever wanted to know about the mouse event but were afraid to ask.
             */
           public void mousePressed(MouseEvent e) {
                 JList list = (JList) e.getSource();
                 int index = list.locationToIndex(e.getPoint());
                 Entry checkbox = (Entry)list.getModel().getElementAt(index);
+    public Component getListCellRendererComponent(JList list, Object value, int index, boolean is_selected, boolean cell_has_focus) {
+        JCheckBox checkbox = (JCheckBox) value;
+        checkbox.setBackground(is_selected ? list.getSelectionBackground() : list.getBackground());
+        checkbox.setForeground(is_selected ? list.getSelectionForeground() : list.getForeground());
+        checkbox.setEnabled(list.isEnabled());
+        checkbox.setFont(list.getFont());
+        checkbox.setFocusPainted(false);
+        checkbox.setBorderPainted(true);
+        checkbox.setBorder((is_selected) ? UIManager.getBorder("List.focusCellHighlightBorder") : noFocusBorder);
+        return checkbox;
+    }
+    }
+    /** Listens for clicks apon the checks within the list, and updates as necessary. */
+    private class CheckListListener
+    extends MouseAdapter {
+    private Entry previous_checkbox = null;
+    /** Called whenever the mouse is clicked over our list. We find the nearest checkbox and change its state.
+     * @param e A <strong>MouseEvent</strong> containing everything you ever wanted to know about the mouse event but were afraid to ask.
+     */
+    public void mousePressed(MouseEvent e) {
+        JList list = (JList) e.getSource();
+        int index = list.locationToIndex(e.getPoint());
+        Entry checkbox = (Entry)list.getModel().getElementAt(index);
                 // If this is the same checkbox as was recently selected, change the tick.
                 if(list.isSelectedIndex(index) && checkbox == previous_checkbox) {
                      if(!checkbox.isFixed()) {
                           checkbox.setSelected(!checkbox.isSelected());
+                     }
                      checkbox.grabFocus();
+                }
+        if(list.isSelectedIndex(index) && checkbox == previous_checkbox) {
+        if(!checkbox.isFixed()) {
+            checkbox.setSelected(!checkbox.isSelected());
+        }
+        checkbox.grabFocus();
+        }
                 // Otherwise the selection has just changed, so select the new checkbox
                 else if(list.isSelectedIndex(index)) {
                      previous_checkbox = checkbox;
+                }
                 else {
                      previous_checkbox = null;
+                }
+          }
+     }
+        else if(list.isSelectedIndex(index)) {
+        previous_checkbox = checkbox;
+        }
+        else {
+        previous_checkbox = null;
+        }
+    }
+    }
+}

trunk/gli/src/org/greenstone/gatherer/checklist/Entry.java

-              r4293
+              r4366
 /** An Entry encapsulates a single row of the list, both its check box and the object the row represents. */
 public class Entry
      extends JCheckBox {
      /** Is this checkboxes state fixed. */
      private boolean fixed = false;
      /** The original object this row is based on, and whose toString() is used to generate the check box label. */
      private Object object = null;
      /** A sundry string for storing original values (rather than strings retrieved from dictionary). */
      private String property;
      /** Constructor. */
      public Entry(Object object) {
           super(object.toString());
           this.object = object;
           // We also build a special tool tip for metadata sets.
           if(object instanceof MetadataSet) {
                 MetadataSet set = (MetadataSet) object;
+    extends JCheckBox {
+    /** Is this checkboxes state fixed. */
+    private boolean fixed = false;
+    /** The original object this row is based on, and whose toString() is used to generate the check box label. */
+    private Object object = null;
+    /** A sundry string for storing original values (rather than strings retrieved from dictionary). */
+    private String property;
+    /** Constructor. */
+    public Entry(Object object) {
+    super(object.toString());
+    this.object = object;
+    // We also build a special tool tip for metadata sets.
+    if(object instanceof MetadataSet) {
+        MetadataSet set = (MetadataSet) object;
                 // Build tooltip
                 StringBuffer tip = new StringBuffer(Gatherer.dictionary.get("NewCollectionPrompt.Set_Contains"));
                 tip.append(":\n");
                 for(int i = 0; i < set.size(); i++) {
                      Element element = set.getElement(i);
                      tip.append(MSMUtils.getIdentifier(element));
                      if(i < set.size() - 1) {
                           tip.append(", ");
+                     }
+                }
                 setToolTipText(Utility.formatHTMLWidth(tip.toString(), 60));
+          }
+     }
+        StringBuffer tip = new StringBuffer(Gatherer.dictionary.get("NewCollectionPrompt.Set_Contains"));
+        tip.append(":\n");
+        for(int i = 0; i < set.size(); i++) {
+        Element element = set.getElement(i);
+        tip.append(MSMUtils.getIdentifier(element));
+        if(i < set.size() - 1) {
+            tip.append(", ");
+        }
+        }
+        setToolTipText(Utility.formatHTMLWidth(tip.toString(), 60));
+    }
+    }
      /** Constructor. */
      public Entry(String text, boolean is_selected) {
           super(text);
           setSelected(is_selected);
+     }
+    /** Constructor. */
+    public Entry(String text, boolean is_selected) {
+    super(text);
+    setSelected(is_selected);
+    }
      /** Retrieve the object associated with this entry.
+    /** Retrieve the object associated with this entry.
       * @return An <strong>Object</strong>.
       */
      public Object getObject() {
           if(object == null) {
                 return getText();
+          }
           return object;
+     }
+    public Object getObject() {
+    if(object == null) {
+        return getText();
+    }
+    return object;
+    }
      public String getProperty() {
           return property;
+     }
+    public String getProperty() {
+    return property;
+    }
      public boolean isFixed() {
           return fixed;
+     }
+    public boolean isFixed() {
+    return fixed;
+    }
      public void setFixed(boolean fixed) {
           this.fixed = fixed;
+     }
+    public void setFixed(boolean fixed) {
+    this.fixed = fixed;
+    }
      public void setProperty(String property) {
           this.property = property;
+     }
+    public void setProperty(String property) {
+    this.property = property;
+    }
      public String toString() {
           if(object == null) {
                 return getText();
+          }
           return object.toString();
+     }
+    public String toString() {
+    if(object == null) {
+        return getText();
+    }
+    return object.toString();
+    }
+}

trunk/gli/src/org/greenstone/gatherer/collection/BuildOptions.java

-              r4293
+              r4366
 /** Build options uses the argument list found in config.xml and the current settings from the loaded collection configuration to represent the options the user wants to use during import and build. If there are no arguments stored in config.xml, or if the user indicates the argument are out of date, this class tries to parse new ones. */
 public class BuildOptions {
      /** The root element of the build argument tree. */
      private Element build_arguments_element;
      /** The root element of the build values tree. */
      private Element build_values_element;
      /** The root element of the import argument tree. */
      private Element import_arguments_element;
      /** The root element of the import values tree. */
      private Element import_values_element;
      /** A cache of previously created build arguments. */
      private Hashtable build_arguments_cache = new Hashtable();
      /** A cache of previously created import arguments. */
      private Hashtable import_arguments_cache = new Hashtable();
      /** The name of an argument element. */
      static final private String ARGUMENT = "Argument";
      /** The name of the enabled attribute. */
      static final private String ENABLED = "enabled";
      /** The name of the 'false' value. */
      static final private String FALSE = "false";
      /** The name of a name attribute. */
      static final private String NAME = "name";
      /** The name of an option element. */
      static final private String OPTION = "Option";
      /** The name of the 'true' value. */
      static final private String TRUE = "true";
      /** When constructing a BuildOptions object we first try to retrieve the valid arguments from config.xml. If that fails we then try to parse the arguments noticed when calling import.pl -xml and buildcol.pl -xml. If that also fails, we load the default arguments from the xml template library. */
      public BuildOptions(Element build_values_element, Element import_values_element) {
           // Try to retrieve the arguments for import and build.
           build_arguments_element = Gatherer.config.getArguments("buildcol.pl");
           import_arguments_element = Gatherer.config.getArguments("import.pl");
           // If that fails try to reconstruct the arguments
           if(build_arguments_element == null || import_arguments_element == null) {
                 build_arguments_element = loadArguments("buildcol.pl");
                 import_arguments_element = loadArguments("import.pl");
+    /** The root element of the build argument tree. */
+    private Element build_arguments_element;
+    /** The root element of the build values tree. */
+    private Element build_values_element;
+    /** The root element of the import argument tree. */
+    private Element import_arguments_element;
+    /** The root element of the import values tree. */
+    private Element import_values_element;
+    /** A cache of previously created build arguments. */
+    private Hashtable build_arguments_cache = new Hashtable();
+    /** A cache of previously created import arguments. */
+    private Hashtable import_arguments_cache = new Hashtable();
+    /** The name of an argument element. */
+    static final private String ARGUMENT = "Argument";
+    /** The name of the enabled attribute. */
+    static final private String ENABLED = "enabled";
+    /** The name of the 'false' value. */
+    static final private String FALSE = "false";
+    /** The name of a name attribute. */
+    static final private String NAME = "name";
+    /** The name of an option element. */
+    static final private String OPTION = "Option";
+    /** The name of the 'true' value. */
+    static final private String TRUE = "true";
+    /** When constructing a BuildOptions object we first try to retrieve the valid arguments from config.xml. If that fails we then try to parse the arguments noticed when calling import.pl -xml and buildcol.pl -xml. If that also fails, we load the default arguments from the xml template library. */
+    public BuildOptions(Element build_values_element, Element import_values_element) {
+    // Try to retrieve the arguments for import and build.
+    build_arguments_element = Gatherer.config.getArguments("buildcol.pl");
+    import_arguments_element = Gatherer.config.getArguments("import.pl");
+    // If that fails try to reconstruct the arguments
+    if(build_arguments_element == null || import_arguments_element == null) {
+        build_arguments_element = loadArguments("buildcol.pl");
+        import_arguments_element = loadArguments("import.pl");
                 // And if that too fails, load the default argument templates
+                if(build_arguments_element == null || import_arguments_element == null) {
+                     Document build_document = Utility.parse("xml" + File.separator + "buildcol.xml", true);
+                     build_arguments_element = build_document.getDocumentElement();
+                     build_document = null;
+                     Document import_document = Utility.parse("xml" + File.separator + "import.xml", true);
+                     import_arguments_element = import_document.getDocumentElement();
+                     import_document = null;
+                     ///atherer.println("Loaded default BO arguments from templates.");
+        if(build_arguments_element == null || import_arguments_element == null) {
+        Document build_document = Utility.parse("xml" + File.separator + "buildcol.xml", true);
+        build_arguments_element = build_document.getDocumentElement();
+        build_document = null;
+        Document import_document = Utility.parse("xml" + File.separator + "import.xml", true);
+        import_arguments_element = import_document.getDocumentElement();
+        import_document = null;
+        ///atherer.println("Loaded default BO arguments from templates.");
+        }
+        else {
+        ///atherer.println("Loaded BO arguments from scripts.");
+        }
+                // By now we should definately have the arguments. However the reason we are here is because they are not stored in the config.xml file, to make sure they are stored now.
+        Gatherer.config.setArguments(build_arguments_element);
+        Gatherer.config.setArguments(import_arguments_element);
+    }
+    else {
+        Gatherer.println("Loaded BO arguments from config.xml");
+    }
+    // Now take a note of the values too.
+    this.build_values_element = build_values_element;
+    this.import_values_element = import_values_element;
+    }
+    /** Retrieve the arguments associated with a certain type of action, ie import or build. */
+    public String[] getArguments(boolean build) {
+    String arguments[] = null;
+    NodeList argument_list = null;
+    if(build) {
+        argument_list = build_values_element.getElementsByTagName(ARGUMENT);
+    }
+    else {
+        argument_list = import_values_element.getElementsByTagName(ARGUMENT);
+    }
+    for(int i = 0; i < argument_list.getLength(); i++) {
+        String[] temp = new String[2];
+        Element argument = (Element) argument_list.item(i);
+        ArrayTools.add(arguments, argument.getAttribute(NAME));
+        String value = MSMUtils.getValue(argument);
+        if(value != null && value.length() > 0) {
+        ArrayTools.add(arguments, value);
+        }
+    }
+    return arguments;
+    }
+    /** Retrieve the indexth argument belonging to build. */
+    public Argument getBuildArgument(int index) {
+    Argument argument = null;
+    // Try to find the argument in the cache.
+    SoftReference reference = (SoftReference) build_arguments_cache.get(new Integer(index));
+    if(reference != null) {
+        argument = (Argument) reference.get();
+    }
+    // Otherwise generate a new argument.
+    if(argument == null) {
+        argument = getArgument(build_arguments_element, index);
+    }
+    return argument;
+    }
+    /** Retrieve the number of arguments involved in building. */
+    public int getBuildArgumentCount() {
+    NodeList build_options = build_arguments_element.getElementsByTagName(OPTION);
+    return build_options.getLength();
+    }
+    /** Retrieve the value of a certain build argument. */
+    public String getBuildValue(String name) {
+    return getValue(build_values_element, name, false);
+    }
+    /** Determine if the named argument value is enabled or disabled. */
+    public boolean getBuildValueEnabled(String name) {
+    boolean result = false;
+    String value = getValue(build_values_element, name, true);
+    if(value != null && value.length() > 0) {
+        result = (value.equalsIgnoreCase(TRUE));
+    }
+    return result;
+    }
+    /** Retrieve all of the build values as a String array ready to added to the buildcol.pl call. */
+    public String[] getBuildValues() {
+    return getValues(build_values_element);
+    }
+    /** Retrieve the indexth argument belonging to import. */
+    public Argument getImportArgument(int index) {
+    Argument argument = null;
+    // Try to find the argument in the cache.
+    SoftReference reference = (SoftReference) import_arguments_cache.get(new Integer(index));
+    if(reference != null) {
+        argument = (Argument) reference.get();
+    }
+    // Otherwise generate a new argument.
+    if(argument == null) {
+        argument = getArgument(import_arguments_element, index);
+    }
+    return argument;
+    }
+    /** Retrieve the number of arguments involved in importing. */
+    public int getImportArgumentCount() {
+    NodeList import_options = import_arguments_element.getElementsByTagName(OPTION);
+    return import_options.getLength();
+    }
+    /** Retrieve the value of a certain build argument. */
+    public String getImportValue(String name) {
+    return getValue(import_values_element, name, false);
+    }
+    /** Determine if the named argument value is enabled or disabled. */
+    public boolean getImportValueEnabled(String name) {
+    boolean result = false;
+    String value = getValue(import_values_element, name, true);
+    if(value != null && value.length() > 0) {
+        result = (value.equalsIgnoreCase(TRUE));
+    }
+    return result;
+    }
+    /** Retrieve all of the import arguments in a form ready to be sent out to a shell process. */
+    public String[] getImportValues() {
+    return getValues(import_values_element);
+    }
+    /** Set the value of a build argument. */
+    public void setBuildValue(String name, boolean enable, String value) {
+    setValue(build_values_element, name, enable, value);
+    }
+    /** Set the value of a build argument. */
+    public void setImportValue(String name, boolean enable, String value) {
+    setValue(import_values_element, name, enable, value);
+    }
+    /** Remove the given build value. */
+    public void removeBuildValue(String name) {
+    removeValue(build_values_element, name);
+    }
+    /** Remove the given import value. */
+    public void removeImportValue(String name) {
+    removeValue(import_values_element, name);
+    }
+    /** Retrieve the indexth element from the given set of arguments. */
+    private Argument getArgument(Element arguments_element, int index) {
+    Argument argument = null;
+    try {
+        NodeList option_list = arguments_element.getElementsByTagName(OPTION);
+        if(0 <= index && index < option_list.getLength()) {
+        // Retrieve the appropriate argument
+        Element option = (Element) option_list.item(index);
+        // Iterate through this option elements children, making note of any details we find.
+        argument = new Argument();
+        for(Node node = option.getFirstChild(); node != null; node = node.getNextSibling()) {
+            String node_name = node.getNodeName();
+            if(node_name.equals("Name")) {
+            argument.setName(MSMUtils.getValue(node));
+            }
+            else if(node_name.equals("Desc")) {
+            argument.setDesc(MSMUtils.getValue(node));
+            }
+            else if(node_name.equals("Type")) {
+            argument.setType(MSMUtils.getValue(node));
+            }
+            else if(node_name.equals("Default")) {
+            argument.setDefault(MSMUtils.getValue(node));
+            }
+            else if(node_name.equals("List")) {
+            // Two final loops are required to parse lists.
+            for(Node value = node.getFirstChild(); value != null; value = value.getNextSibling()) {
+                if(value.getNodeName().equals("Value")) {
+                String key = null;
+                String desc = "";
+                for(Node subvalue = value.getFirstChild(); subvalue != null; subvalue = subvalue.getNextSibling()) {
+                    node_name = subvalue.getNodeName();
+                    if(node_name.equals("Name")) {
+                    key = MSMUtils.getValue(subvalue);
+                    }
+                    else if(node_name.equals("Desc")) {
+                    desc = MSMUtils.getValue(subvalue);
+                    }
+                }
                 else {
                      ///atherer.println("Loaded BO arguments from scripts.");
+                if(key != null) {
+                    argument.addOption(key, desc);
+                }
+                // By now we should definately have the arguments. However the reason we are here is because they are not stored in the config.xml file, to make sure they are stored now.
+                Gatherer.config.setArguments(build_arguments_element);
+                Gatherer.config.setArguments(import_arguments_element);
+          }
+          else {
+                Gatherer.println("Loaded BO arguments from config.xml");
+          }
+          // Now take a note of the values too.
+          this.build_values_element = build_values_element;
+          this.import_values_element = import_values_element;
+     }
+     /** Retrieve the arguments associated with a certain type of action, ie import or build. */
+     public String[] getArguments(boolean build) {
+          String arguments[] = null;
+          NodeList argument_list = null;
+          if(build) {
+                argument_list = build_values_element.getElementsByTagName(ARGUMENT);
+          }
+          else {
+                argument_list = import_values_element.getElementsByTagName(ARGUMENT);
+          }
+          for(int i = 0; i < argument_list.getLength(); i++) {
+                String[] temp = new String[2];
+                Element argument = (Element) argument_list.item(i);
+                ArrayTools.add(arguments, argument.getAttribute(NAME));
+                String value = MSMUtils.getValue(argument);
+                if(value != null && value.length() > 0) {
+                     ArrayTools.add(arguments, value);
+                }
+          }
+          return arguments;
+     }
+     /** Retrieve the indexth argument belonging to build. */
+     public Argument getBuildArgument(int index) {
+          Argument argument = null;
+          // Try to find the argument in the cache.
+          SoftReference reference = (SoftReference) build_arguments_cache.get(new Integer(index));
+          if(reference != null) {
+                argument = (Argument) reference.get();
+          }
+          // Otherwise generate a new argument.
+          if(argument == null) {
+                argument = getArgument(build_arguments_element, index);
+          }
+          return argument;
+     }
+     /** Retrieve the number of arguments involved in building. */
+     public int getBuildArgumentCount() {
+          NodeList build_options = build_arguments_element.getElementsByTagName(OPTION);
+          return build_options.getLength();
+     }
+     /** Retrieve the value of a certain build argument. */
+     public String getBuildValue(String name) {
+          return getValue(build_values_element, name, false);
+     }
+     /** Determine if the named argument value is enabled or disabled. */
+     public boolean getBuildValueEnabled(String name) {
+          boolean result = false;
+          String value = getValue(build_values_element, name, true);
+          if(value != null && value.length() > 0) {
+                result = (value.equalsIgnoreCase(TRUE));
+          }
+          return result;
+     }
+     /** Retrieve all of the build values as a String array ready to added to the buildcol.pl call. */
+     public String[] getBuildValues() {
+          return getValues(build_values_element);
+     }
+     /** Retrieve the indexth argument belonging to import. */
+     public Argument getImportArgument(int index) {
+          Argument argument = null;
+          // Try to find the argument in the cache.
+          SoftReference reference = (SoftReference) import_arguments_cache.get(new Integer(index));
+          if(reference != null) {
+                argument = (Argument) reference.get();
+          }
+          // Otherwise generate a new argument.
+          if(argument == null) {
+                argument = getArgument(import_arguments_element, index);
+          }
+          return argument;
+     }
+     /** Retrieve the number of arguments involved in importing. */
+     public int getImportArgumentCount() {
+          NodeList import_options = import_arguments_element.getElementsByTagName(OPTION);
+          return import_options.getLength();
+     }
+     /** Retrieve the value of a certain build argument. */
+     public String getImportValue(String name) {
+          return getValue(import_values_element, name, false);
+     }
+     /** Determine if the named argument value is enabled or disabled. */
+     public boolean getImportValueEnabled(String name) {
+          boolean result = false;
+          String value = getValue(import_values_element, name, true);
+          if(value != null && value.length() > 0) {
+                result = (value.equalsIgnoreCase(TRUE));
+          }
+          return result;
+     }
+     /** Retrieve all of the import arguments in a form ready to be sent out to a shell process. */
+     public String[] getImportValues() {
+          return getValues(import_values_element);
+     }
+     /** Set the value of a build argument. */
+     public void setBuildValue(String name, boolean enable, String value) {
+          setValue(build_values_element, name, enable, value);
+     }
+     /** Set the value of a build argument. */
+     public void setImportValue(String name, boolean enable, String value) {
+          setValue(import_values_element, name, enable, value);
+     }
+     /** Remove the given build value. */
+     public void removeBuildValue(String name) {
+          removeValue(build_values_element, name);
+     }
+     /** Remove the given import value. */
+     public void removeImportValue(String name) {
+          removeValue(import_values_element, name);
+     }
+     /** Retrieve the indexth element from the given set of arguments. */
+     private Argument getArgument(Element arguments_element, int index) {
+          Argument argument = null;
+          try {
+                NodeList option_list = arguments_element.getElementsByTagName(OPTION);
+                if(0 <= index && index < option_list.getLength()) {
+                     // Retrieve the appropriate argument
+                     Element option = (Element) option_list.item(index);
+                     // Iterate through this option elements children, making note of any details we find.
+                     argument = new Argument();
+                     for(Node node = option.getFirstChild(); node != null; node = node.getNextSibling()) {
+                          String node_name = node.getNodeName();
+                          if(node_name.equals("Name")) {
+                                argument.setName(MSMUtils.getValue(node));
+                          }
+                          else if(node_name.equals("Desc")) {
+                                argument.setDesc(MSMUtils.getValue(node));
+                          }
+                          else if(node_name.equals("Type")) {
+                                argument.setType(MSMUtils.getValue(node));
+                          }
+                          else if(node_name.equals("Default")) {
+                                argument.setDefault(MSMUtils.getValue(node));
+                          }
+                          else if(node_name.equals("List")) {
+                                // Two final loops are required to parse lists.
+                                for(Node value = node.getFirstChild(); value != null; value = value.getNextSibling()) {
+                                     if(value.getNodeName().equals("Value")) {
+                                          String key = null;
+                                          String desc = "";
+                                          for(Node subvalue = value.getFirstChild(); subvalue != null; subvalue = subvalue.getNextSibling()) {
+                                                node_name = subvalue.getNodeName();
+                                                if(node_name.equals("Name")) {
+                                                     key = MSMUtils.getValue(subvalue);
+                                                }
+                                                else if(node_name.equals("Desc")) {
+                                                     desc = MSMUtils.getValue(subvalue);
+                                                }
+                                          }
+                                          if(key != null) {
+                                                argument.addOption(key, desc);
+                                          }
+                                     }
+                                }
+                          }
+                          else if(node_name.equals("Required")) {
+                                String v = MSMUtils.getValue(node);
+                                if(v != null && v.equals("yes")) {
+                                     argument.setRequired(true);
+                                }
+                          }
+                     }
+                }
+          }
+          catch (Exception error) {
+                Gatherer.println("Error in BuildOptions.getArgument(): " + error);
+                Gatherer.printStackTrace(error);
+          }
+          return argument;
+     }
+     private String getValue(Element arguments_element, String name, boolean is_enabled) {
+          String result = null;
+          try {
+                NodeList arguments = arguments_element.getElementsByTagName(ARGUMENT);
+                for(int i = 0; result == null && i < arguments.getLength(); i++) {
+                     Element argument_element = (Element) arguments.item(i);
+                     // Is this the argument we want.
+                     if(argument_element.getAttribute(NAME).equalsIgnoreCase(name)) {
+                          // Are we simply determining if this argument is enabled
+                          if(is_enabled) {
+                                result = argument_element.getAttribute(ENABLED);
+                          }
+                          else {
+                                String argument_value = MSMUtils.getValue(argument_element);
+                                if(argument_value != null) {
+                                     result = argument_value;
+                                }
+                                argument_value = null;
+                          }
+                     }
+                     argument_element = null;
+                }
+                arguments = null;
+          }
+          catch (Exception error) {
+                Gatherer.printStackTrace(error);
+          }
+          return result;
+     }
+     private String[] getValues(Element arguments_element) {
+          ArrayList values = new ArrayList();
+          try {
+                NodeList arguments = arguments_element.getElementsByTagName(ARGUMENT);
+                for(int i = 0; i < arguments.getLength(); i++) {
+                     Element argument_element = (Element) arguments.item(i);
+                     // Determine if this argument is enabled.
+                     if(argument_element.getAttribute(ENABLED).equalsIgnoreCase(TRUE)) {
+                          // First store the name of the argument prefixed with a '-'
+                          values.add("-" + argument_element.getAttribute(NAME));
+                          // Now retrieve the value.
+                          String argument_value = MSMUtils.getValue(argument_element);
+                          // If there is a value, tokenize it by commas only.
+                          if(argument_value != null && argument_value.length() > 0) {
+                                values.add(argument_value);
+                          }
+                          argument_value = null;
+                     }
+                     argument_element = null;
+                }
+                arguments = null;
+          }
+          catch (Exception error) {
+                Gatherer.printStackTrace(error);
+          }
+          return ArrayTools.arrayListToStringArray(values);
+     }
+     private Element loadArguments(String filename) {
+          Element arguments_element = null;
+          // Run the required program.
+          /** @todo - I never finished implementing this. Have to test that the perl script handles being loaded in this way.
+          try {
+                String args[] = new String[3];
+                args[0] = Gatherer.config.perl_path;
+                args[1] = filename;
+                args[2] = "-xml";
+                }
+            }
+            }
+            else if(node_name.equals("Required")) {
+            String v = MSMUtils.getValue(node);
+            if(v != null && v.equals("yes")) {
+                argument.setRequired(true);
+            }
+            }
+        }
+        }
+    }
+    catch (Exception error) {
+        Gatherer.println("Error in BuildOptions.getArgument(): " + error);
+        Gatherer.printStackTrace(error);
+    }
+    return argument;
+    }
+    private String getValue(Element arguments_element, String name, boolean is_enabled) {
+    String result = null;
+    try {
+        NodeList arguments = arguments_element.getElementsByTagName(ARGUMENT);
+        for(int i = 0; result == null && i < arguments.getLength(); i++) {
+        Element argument_element = (Element) arguments.item(i);
+        // Is this the argument we want.
+        if(argument_element.getAttribute(NAME).equalsIgnoreCase(name)) {
+            // Are we simply determining if this argument is enabled
+            if(is_enabled) {
+            result = argument_element.getAttribute(ENABLED);
+            }
+            else {
+            String argument_value = MSMUtils.getValue(argument_element);
+            if(argument_value != null) {
+                result = argument_value;
+            }
+            argument_value = null;
+            }
+        }
+        argument_element = null;
+        }
+        arguments = null;
+    }
+    catch (Exception error) {
+        Gatherer.printStackTrace(error);
+    }
+    return result;
+    }
+    private String[] getValues(Element arguments_element) {
+    ArrayList values = new ArrayList();
+    try {
+        NodeList arguments = arguments_element.getElementsByTagName(ARGUMENT);
+        for(int i = 0; i < arguments.getLength(); i++) {
+        Element argument_element = (Element) arguments.item(i);
+        // Determine if this argument is enabled.
+        if(argument_element.getAttribute(ENABLED).equalsIgnoreCase(TRUE)) {
+            // First store the name of the argument prefixed with a '-'
+            values.add("-" + argument_element.getAttribute(NAME));
+            // Now retrieve the value.
+            String argument_value = MSMUtils.getValue(argument_element);
+            // If there is a value, tokenize it by commas only.
+            if(argument_value != null && argument_value.length() > 0) {
+            values.add(argument_value);
+            }
+            argument_value = null;
+        }
+        argument_element = null;
+        }
+        arguments = null;
+    }
+    catch (Exception error) {
+        Gatherer.printStackTrace(error);
+    }
+    return ArrayTools.arrayListToStringArray(values);
+    }
+    private Element loadArguments(String filename) {
+    Element arguments_element = null;
+    // Run the required program.
+    /** @todo - I never finished implementing this. Have to test that the perl script handles being loaded in this way.
+        try {
+        String args[] = new String[3];
+        args[0] = Gatherer.config.perl_path;
+        args[1] = filename;
+        args[2] = "-xml";
                 // Create the process.
                 Runtime runtime = Runtime.getRuntime();
 …
                 Document document = parser.getDocument();
                 arguments_element = document.getDocumentElement();
+          }
           catch (Exception error) {
+                }
+                catch (Exception error) {
                 Gatherer.println("Error in BuildOptions.loadArguments(): " + error);
                 Gatherer.printStackTrace(error);
+          }
-          */
-          return arguments_element;
+     }
-     /** Set the state of some build or import argument. Note that value may be either a single String, and ArrayList of Strings or null. If enable is false then any existing argument for the named argument is disabled. */
-     public void setValue(Element arguments_element, String name, boolean enable, String value) {
-          ///ystem.err.println("Set value: " + (arguments_element == build_values_element ? "Build" : "Import") + ", " + name + ", " + enable + ", " + value);
-          try {
-                Document document = arguments_element.getOwnerDocument();
-                NodeList arguments = arguments_element.getElementsByTagName(ARGUMENT);
-                boolean found = false;
-                for(int i = 0; i < arguments.getLength(); i++) {
-                     Element argument_element = (Element) arguments.item(i);
-                     // If this the argument named.
-                     if(argument_element.getAttribute(NAME).equalsIgnoreCase(name)) {
-                          found = true;
-                          // Set whether this argument is enabled
-                          argument_element.setAttribute(ENABLED, (enable ? TRUE : FALSE));
-                          // Now we set the value, depending or what it is.
-                          if(value == null) {
-                                // Nothing to do.
+                          }
-                          else {
-                                // Remove existing text nodes.
-                                while(argument_element.hasChildNodes()) {
-                                     argument_element.removeChild(argument_element.getFirstChild());
+                                }
-                                argument_element.appendChild(document.createTextNode((String)value));
+                          }
+                     }
-                     argument_element = null;
+                }
+    */
+    return arguments_element;
+    }
+    /** Set the state of some build or import argument. Note that value may be either a single String, and ArrayList of Strings or null. If enable is false then any existing argument for the named argument is disabled. */
+    public void setValue(Element arguments_element, String name, boolean enable, String value) {
+    ///ystem.err.println("Set value: " + (arguments_element == build_values_element ? "Build" : "Import") + ", " + name + ", " + enable + ", " + value);
+    try {
+        Document document = arguments_element.getOwnerDocument();
+        NodeList arguments = arguments_element.getElementsByTagName(ARGUMENT);
+        boolean found = false;
+        for(int i = 0; i < arguments.getLength(); i++) {
+        Element argument_element = (Element) arguments.item(i);
+        // If this the argument named.
+        if(argument_element.getAttribute(NAME).equalsIgnoreCase(name)) {
+            found = true;
+            // Set whether this argument is enabled
+            argument_element.setAttribute(ENABLED, (enable ? TRUE : FALSE));
+            // Now we set the value, depending or what it is.
+            if(value == null) {
+            // Nothing to do.
+            }
+            else {
+            // Remove existing text nodes.
+            while(argument_element.hasChildNodes()) {
+                argument_element.removeChild(argument_element.getFirstChild());
+            }
+            argument_element.appendChild(document.createTextNode((String)value));
+            }
+        }
+        argument_element = null;
+        }
                 // If we haven't found an instance of this argument, but should have, then add it.
                 if(!found && (enable || value != null)) {
                      Element argument_element = document.createElement(ARGUMENT);
                      argument_element.setAttribute(NAME, name);
                      argument_element.setAttribute(ENABLED, (enable ? TRUE : FALSE));
                      // Now we set the value, depending or what it is.
                      if(value == null) {
                           // Nothing to do.
+                     }
                      else {
                           argument_element.appendChild(document.createTextNode((String)value));
+                     }
                      arguments_element.appendChild(argument_element);
+                }
                 arguments = null;
                 document = null;
+        if(!found && (enable || value != null)) {
+        Element argument_element = document.createElement(ARGUMENT);
+        argument_element.setAttribute(NAME, name);
+        argument_element.setAttribute(ENABLED, (enable ? TRUE : FALSE));
+        // Now we set the value, depending or what it is.
+        if(value == null) {
+            // Nothing to do.
+        }
+        else {
+            argument_element.appendChild(document.createTextNode((String)value));
+        }
+        arguments_element.appendChild(argument_element);
+        }
+        arguments = null;
+        document = null;
                 // Make sure the collection knows to save.
                 Gatherer.c_man.getCollection().setSaved(false);
+          }
           catch (Exception error) {
                 Gatherer.printStackTrace(error);
+          }
+     }
      /** Remove the named value from the given arguments element. */
      private void removeValue(Element arguments_element, String name) {
           try {
                 NodeList arguments = arguments_element.getElementsByTagName(ARGUMENT);
                 boolean found = false;
                 for(int i = 0; !found && i < arguments.getLength(); i++) {
                      Element argument_element = (Element) arguments.item(i);
                      // Is this the argument we want.
                      if(argument_element.getAttribute(NAME).equalsIgnoreCase(name)) {
                           arguments_element.removeChild(argument_element);
                           found = true;
+                     }
                      argument_element = null;
+                }
                 arguments = null;
+          }
           catch (Exception error) {
                 Gatherer.printStackTrace(error);
+          }
+     }
+        Gatherer.c_man.getCollection().setSaved(false);
+    }
+    catch (Exception error) {
+        Gatherer.printStackTrace(error);
+    }
+    }
+    /** Remove the named value from the given arguments element. */
+    private void removeValue(Element arguments_element, String name) {
+    try {
+        NodeList arguments = arguments_element.getElementsByTagName(ARGUMENT);
+        boolean found = false;
+        for(int i = 0; !found && i < arguments.getLength(); i++) {
+        Element argument_element = (Element) arguments.item(i);
+        // Is this the argument we want.
+        if(argument_element.getAttribute(NAME).equalsIgnoreCase(name)) {
+            arguments_element.removeChild(argument_element);
+            found = true;
+        }
+        argument_element = null;
+        }
+        arguments = null;
+    }
+    catch (Exception error) {
+        Gatherer.printStackTrace(error);
+    }
+    }
+}

trunk/gli/src/org/greenstone/gatherer/collection/Collection.java

-              r4293
+              r4366
  */
 public class Collection {
      /** A reference to the BuildOptions. */
      public BuildOptions build_options;
      /** A reference to the Collection Design Manager. */
      public CollectionDesignManager cdm;
      /** A reference to the Greenstone Directory Metadata Manager. */
      public GDMManager gdm;
      /** A reference to the Metadata Set Manager. */
      public MetadataSetManager msm;
      /** <i>true</i> if the currently loaded collection has been saved since the last significant change, <i>false</i> otherwise. */
      private boolean saved = false;
      /** The collectio configuration file for this collection. */
      private CollectionConfiguration collect_cfg;
      /** The document around which this collection class is based. */
      private Document document;
      /** The file the collection is in (the file may not actually exist, such in the case of a legacy collection)! */
      private File file;
      /** The name of the argument element. */
      static final private String ARGUMENT = "Argument";
      /** The name of the build element. */
      static final private String BUILD = "Build";
      /** The name of the built attribute. */
      static final private String BUILT = "built";
      /** The name of the build config element. */
      static final private String BUILD_CONFIG = "BuildConfig";
      /** The name of the collection xml template. */
      static final private String COLLECTION_XML_TEMPLATE = "xml" + File.separator + "template.col";
      /** The name of the directory mappings element. */
      static final private String DIRECTORY_MAPPINGS = "DirectoryMappings";
      /** The name of the file attribute. */
      static final private String FILE = "file";
      /** The name of the import element. */
      static final private String IMPORT = "Import";
      /** The name of the imported attribute. */
      static final private String IMPORTED = "imported";
      /** The name of the mapping element. */
      static final private String MAPPING = "Mapping";
      /** The name of the name attribute. */
      static final private String NAME = "name";
      /** The name of the true value. */
      static final private String TRUE = "true";
      /** Constructor. */
      public Collection(File collection_xml) {
           this.file = collection_xml;
           // Try to load this collections details.
           document = Utility.parse(collection_xml, false);
           // If that fails load the default settings for a collection.
           if(document == null) {
                 document = Utility.parse(COLLECTION_XML_TEMPLATE, true);
+          }
           // Point the Configuration class at our gatherer config arguments.
           Gatherer.config.setCollectionConfiguration(document);
           // We also attempt to parse the collection configuration file.
           collect_cfg = new CollectionConfiguration(new File(collection_xml.getParentFile(), Utility.CONFIG_DIR));
           // Finally create all of the child managers that are directly dependant on a collection
           build_options = new BuildOptions(getBuildValues(), getImportValues());
+     }
      /** Add a special directory mapping. */
      public boolean addDirectoryMapping(String name, File file) {
           boolean result = false;
           try {
                 Element document_element = document.getDocumentElement();
                 Element directory_mappings_element = (Element) MSMUtils.getNodeFromNamed(document_element, DIRECTORY_MAPPINGS);
+    /** A reference to the BuildOptions. */
+    public BuildOptions build_options;
+    /** A reference to the Collection Design Manager. */
+    public CollectionDesignManager cdm;
+    /** A reference to the Greenstone Directory Metadata Manager. */
+    public GDMManager gdm;
+    /** A reference to the Metadata Set Manager. */
+    public MetadataSetManager msm;
+    /** <i>true</i> if the currently loaded collection has been saved since the last significant change, <i>false</i> otherwise. */
+    private boolean saved = false;
+    /** The collectio configuration file for this collection. */
+    private CollectionConfiguration collect_cfg;
+    /** The document around which this collection class is based. */
+    private Document document;
+    /** The file the collection is in (the file may not actually exist, such in the case of a legacy collection)! */
+    private File file;
+    /** The name of the argument element. */
+    static final private String ARGUMENT = "Argument";
+    /** The name of the build element. */
+    static final private String BUILD = "Build";
+    /** The name of the built attribute. */
+    static final private String BUILT = "built";
+    /** The name of the build config element. */
+    static final private String BUILD_CONFIG = "BuildConfig";
+    /** The name of the collection xml template. */
+    static final private String COLLECTION_XML_TEMPLATE = "xml" + File.separator + "template.col";
+    /** The name of the directory mappings element. */
+    static final private String DIRECTORY_MAPPINGS = "DirectoryMappings";
+    /** The name of the file attribute. */
+    static final private String FILE = "file";
+    /** The name of the import element. */
+    static final private String IMPORT = "Import";
+    /** The name of the imported attribute. */
+    static final private String IMPORTED = "imported";
+    /** The name of the mapping element. */
+    static final private String MAPPING = "Mapping";
+    /** The name of the name attribute. */
+    static final private String NAME = "name";
+    /** The name of the true value. */
+    static final private String TRUE = "true";
+    /** Constructor. */
+    public Collection(File collection_xml) {
+    this.file = collection_xml;
+    // Try to load this collections details.
+    document = Utility.parse(collection_xml, false);
+    // If that fails load the default settings for a collection.
+    if(document == null) {
+        document = Utility.parse(COLLECTION_XML_TEMPLATE, true);
+    }
+    // Point the Configuration class at our gatherer config arguments.
+    Gatherer.config.setCollectionConfiguration(document);
+    // We also attempt to parse the collection configuration file.
+    collect_cfg = new CollectionConfiguration(new File(collection_xml.getParentFile(), Utility.CONFIG_DIR));
+    // Finally create all of the child managers that are directly dependant on a collection
+    build_options = new BuildOptions(getBuildValues(), getImportValues());
+    }
+    /** Add a special directory mapping. */
+    public boolean addDirectoryMapping(String name, File file) {
+    boolean result = false;
+    try {
+        Element document_element = document.getDocumentElement();
+        Element directory_mappings_element = (Element) MSMUtils.getNodeFromNamed(document_element, DIRECTORY_MAPPINGS);
                 // Ensure the name isn't already in use.
                 boolean found = false;
                 NodeList mappings = directory_mappings_element.getElementsByTagName(MAPPING);
                 for(int i = 0; !found && i < mappings.getLength(); i++) {
                      Element mapping_element = (Element) mappings.item(i);
                      if(mapping_element.getAttribute(NAME).equalsIgnoreCase(name)) {
                           found = true;
+                     }
                      mapping_element = null;
+                }
+        boolean found = false;
+        NodeList mappings = directory_mappings_element.getElementsByTagName(MAPPING);
+        for(int i = 0; !found && i < mappings.getLength(); i++) {
+        Element mapping_element = (Element) mappings.item(i);
+        if(mapping_element.getAttribute(NAME).equalsIgnoreCase(name)) {
+            found = true;
+        }
+        mapping_element = null;
+        }
                 // Otherwise add the mapping.
                 if(!found) {
                      Element mapping_element = document.createElement(MAPPING);
                      mapping_element.setAttribute(NAME, name);
                      mapping_element.setAttribute(FILE, file.toString());
                      directory_mappings_element.appendChild(mapping_element);
                      result = true;
                      mapping_element = null;
+                }
                 mappings = null;
                 directory_mappings_element = null;
                 document_element = null;
                 saved = false;
+          }
           catch (Exception error) {
                 Gatherer.printStackTrace(error);
+          }
           return result;
+     }
+        if(!found) {
+        Element mapping_element = document.createElement(MAPPING);
+        mapping_element.setAttribute(NAME, name);
+        mapping_element.setAttribute(FILE, file.toString());
+        directory_mappings_element.appendChild(mapping_element);
+        result = true;
+        mapping_element = null;
+        }
+        mappings = null;
+        directory_mappings_element = null;
+        document_element = null;
+        saved = false;
+    }
+    catch (Exception error) {
+        Gatherer.printStackTrace(error);
+    }
+    return result;
+    }
      /** Destructor.
       * @see org.greenstone.gatherer.collection.CollectionModel */
      public void destroy() {
           cdm.destroy();
           gdm.destroy();
           msm.destroy();
           Gatherer.config.setCollectionConfiguration(null);
           cdm = null;
           document = null;
           gdm = null;
           msm = null;
+     }
      /** Determine whether this collection has been successfully built in the past.
       * @return <i>true</i> if the collection has been built, <i>false</i> otherwise.
       */
      public boolean getBuilt() {
           return get(BUILT);
+     }
      /** Calculates the number of documents in this collection. */
      public int getDocumentCount() {
           return getCount((TreeNode)Gatherer.c_man.getRecordSet().getRoot(), false);
+     }
      /** Retrieve the description of this collection.
       * @return The description as a <strong>String</strong>.
       */
      public String getDescription() {
           return collect_cfg.getDescription();
+     }
      /** Retrieve a specific directory mapping associated with this collection.
       * @param name The name of the mapping to retrieve as a <strong>String</strong>.
       * @return The <strong>File</strong> this name maps to, or <i>null</i> if no such mapping.
       */
      public File getDirectoryMapping(String name) {
           File result = null;
           try {
                 Element document_element = document.getDocumentElement();
                 Element directory_mappings_element = (Element) MSMUtils.getNodeFromNamed(document_element, DIRECTORY_MAPPINGS);
+    /** Destructor.
+     * @see org.greenstone.gatherer.collection.CollectionModel */
+    public void destroy() {
+    cdm.destroy();
+    gdm.destroy();
+    msm.destroy();
+    Gatherer.config.setCollectionConfiguration(null);
+    cdm = null;
+    document = null;
+    gdm = null;
+    msm = null;
+    }
+    /** Determine whether this collection has been successfully built in the past.
+     * @return <i>true</i> if the collection has been built, <i>false</i> otherwise.
+     */
+    public boolean getBuilt() {
+    return get(BUILT);
+    }
+    /** Calculates the number of documents in this collection. */
+    public int getDocumentCount() {
+    return getCount((TreeNode)Gatherer.c_man.getRecordSet().getRoot(), false);
+    }
+    /** Retrieve the description of this collection.
+     * @return The description as a <strong>String</strong>.
+     */
+    public String getDescription() {
+    return collect_cfg.getDescription();
+    }
+    /** Retrieve a specific directory mapping associated with this collection.
+     * @param name The name of the mapping to retrieve as a <strong>String</strong>.
+     * @return The <strong>File</strong> this name maps to, or <i>null</i> if no such mapping.
+     */
+    public File getDirectoryMapping(String name) {
+    File result = null;
+    try {
+        Element document_element = document.getDocumentElement();
+        Element directory_mappings_element = (Element) MSMUtils.getNodeFromNamed(document_element, DIRECTORY_MAPPINGS);
                 // Ensure the name isn't already in use.
                 boolean found = false;
                 NodeList mappings = directory_mappings_element.getElementsByTagName(MAPPING);
                 for(int i = 0; !found && i < mappings.getLength(); i++) {
                      Element mapping_element = (Element) mappings.item(i);
                      if(mapping_element.getAttribute(NAME).equalsIgnoreCase(name)) {
                           result = new File(MSMUtils.getValue(mapping_element));
                           found = true;
+                     }
                      mapping_element = null;
+                }
                 mappings = null;
                 directory_mappings_element = null;
                 document_element = null;
+          }
           catch(Exception error) {
                 Gatherer.printStackTrace(error);
+          }
           return result;
+     }
      /** Retrieve the special directory mappings associated with this collection.
       * @return A <strong>HashMap</strong> containing mappings from names to directories.
       */
      public HashMap getDirectoryMappings() {
           HashMap special_directories = new HashMap();
           try {
                 Element document_element = document.getDocumentElement();
                 Element directory_mappings_element = (Element) MSMUtils.getNodeFromNamed(document_element, DIRECTORY_MAPPINGS);
+        boolean found = false;
+        NodeList mappings = directory_mappings_element.getElementsByTagName(MAPPING);
+        for(int i = 0; !found && i < mappings.getLength(); i++) {
+        Element mapping_element = (Element) mappings.item(i);
+        if(mapping_element.getAttribute(NAME).equalsIgnoreCase(name)) {
+            result = new File(MSMUtils.getValue(mapping_element));
+            found = true;
+        }
+        mapping_element = null;
+        }
+        mappings = null;
+        directory_mappings_element = null;
+        document_element = null;
+    }
+    catch(Exception error) {
+        Gatherer.printStackTrace(error);
+    }
+    return result;
+    }
+    /** Retrieve the special directory mappings associated with this collection.
+     * @return A <strong>HashMap</strong> containing mappings from names to directories.
+     */
+    public HashMap getDirectoryMappings() {
+    HashMap special_directories = new HashMap();
+    try {
+        Element document_element = document.getDocumentElement();
+        Element directory_mappings_element = (Element) MSMUtils.getNodeFromNamed(document_element, DIRECTORY_MAPPINGS);
                 // Ensure the name isn't already in use.
                 boolean found = false;
                 NodeList mappings = directory_mappings_element.getElementsByTagName(MAPPING);
                 for(int i = 0; !found && i < mappings.getLength(); i++) {
                      Element mapping_element = (Element) mappings.item(i);
                      String name = mapping_element.getAttribute(NAME);
                      File file = new File(mapping_element.getAttribute(FILE));
                      special_directories.put(name, file);
                      file = null;
                      name = null;
                      mapping_element = null;
+                }
                 mappings = null;
                 directory_mappings_element = null;
                 document_element = null;
+          }
           catch(Exception error) {
                 Gatherer.printStackTrace(error);
+          }
           return special_directories;
+     }
      /** Retrieve the authors email for this collection.
       * @return The email as a <strong>String</strong>.
       */
      public String getEmail() {
           return collect_cfg.getCreator();
+     }
      /** Counts the number of folders used in the current record set. */
      public int getFolderCount() {
           return getCount((TreeNode)Gatherer.c_man.getRecordSet().getRoot(), true);
+     }
      /** Determine if this collection has had an import action run upon it since the last major change.
       * @return <i>true</i> if an import has occured, <i>false</i> otherwise.
       */
      public boolean getImported() {
           return get(IMPORTED);
+     }
      /** Retrieve the short name for this collection.
       * @return The name as a <strong>String</strong>.
       */
      public String getName() {
           return file.getParentFile().getName();
+     }
      /** Determine if this collection has been saved since the last major change.
       * @return <i>true</i> if it has been saved recently, <i>false</i> otherwise.
       */
      public boolean getSaved() {
           return saved;
+     }
      /** Retrieve the title of this collection.
       * @return The title as a <strong>String</strong>.
       */
      public String getTitle() {
           return collect_cfg.getName();
+     }
      /** Remove a previously defined special directory mapping.
       * @param name The name of the mapping to remove as a <strong>String</strong>.
       * @return The <strong>File</strong> of the mapping removed.
       */
      public File removeDirectoryMapping(String name) {
           File file = null;
           try {
                 Element document_element = document.getDocumentElement();
                 Element directory_mappings_element = (Element) MSMUtils.getNodeFromNamed(document_element, DIRECTORY_MAPPINGS);
+        boolean found = false;
+        NodeList mappings = directory_mappings_element.getElementsByTagName(MAPPING);
+        for(int i = 0; !found && i < mappings.getLength(); i++) {
+        Element mapping_element = (Element) mappings.item(i);
+        String name = mapping_element.getAttribute(NAME);
+        File file = new File(mapping_element.getAttribute(FILE));
+        special_directories.put(name, file);
+        file = null;
+        name = null;
+        mapping_element = null;
+        }
+        mappings = null;
+        directory_mappings_element = null;
+        document_element = null;
+    }
+    catch(Exception error) {
+        Gatherer.printStackTrace(error);
+    }
+    return special_directories;
+    }
+    /** Retrieve the authors email for this collection.
+     * @return The email as a <strong>String</strong>.
+     */
+    public String getEmail() {
+    return collect_cfg.getCreator();
+    }
+    /** Counts the number of folders used in the current record set. */
+    public int getFolderCount() {
+    return getCount((TreeNode)Gatherer.c_man.getRecordSet().getRoot(), true);
+    }
+    /** Determine if this collection has had an import action run upon it since the last major change.
+     * @return <i>true</i> if an import has occured, <i>false</i> otherwise.
+     */
+    public boolean getImported() {
+    return get(IMPORTED);
+    }
+    /** Retrieve the short name for this collection.
+     * @return The name as a <strong>String</strong>.
+     */
+    public String getName() {
+    return file.getParentFile().getName();
+    }
+    /** Determine if this collection has been saved since the last major change.
+     * @return <i>true</i> if it has been saved recently, <i>false</i> otherwise.
+     */
+    public boolean getSaved() {
+    return saved;
+    }
+    /** Retrieve the title of this collection.
+     * @return The title as a <strong>String</strong>.
+     */
+    public String getTitle() {
+    return collect_cfg.getName();
+    }
+    /** Remove a previously defined special directory mapping.
+     * @param name The name of the mapping to remove as a <strong>String</strong>.
+     * @return The <strong>File</strong> of the mapping removed.
+     */
+    public File removeDirectoryMapping(String name) {
+    File file = null;
+    try {
+        Element document_element = document.getDocumentElement();
+        Element directory_mappings_element = (Element) MSMUtils.getNodeFromNamed(document_element, DIRECTORY_MAPPINGS);
                 // Ensure the name isn't already in use.
                 boolean found = false;
                 NodeList mappings = directory_mappings_element.getElementsByTagName(MAPPING);
                 for(int i = 0; !found && i < mappings.getLength(); i++) {
                      Element mapping_element = (Element) mappings.item(i);
                      if(mapping_element.getAttribute(NAME).equalsIgnoreCase(name)) {
                           file = new File(MSMUtils.getValue(mapping_element));
                           directory_mappings_element.removeChild(mapping_element);
                           found = true;
+                     }
                      mapping_element = null;
+                }
                 mappings = null;
                 directory_mappings_element = null;
                 document_element = null;
                 saved = false;
+          }
           catch(Exception error) {
                 Gatherer.printStackTrace(error);
+          }
           return file;
+     }
      /** Save this xml document to the given file. */
      public void save() {
           Utility.export(document, file);
+     }
      /** Set the value of built to the given value.
       * @param value The new value for built, <i>true</i> if the collection has been built successfully, <i>false</i> otherwise.
       */
      public void setBuilt(boolean value) {
           set(BUILT, value);
           saved = false;
+     }
      /** Set the value of imported to the given value.
       * @param value The new value for imported, <i>true</i> if the collection has been imported successfully, <i>false</i> otherwise.
       */
      public void setImported(boolean value) {
           set(IMPORTED, value);
           saved = false;
+     }
      /** Set the value of saved to the given value.
       * @param value The new value for saved, <i>true</i> if the collection has been saved recently, <i>false</i> otherwise.
       */
      public void setSaved(boolean value) {
           saved = value;
+     }
      /** Set the value of title to the given value.
       * @param title The new <strong>String</strong> title.
       */
      public void setTitle(String title) {
           collect_cfg.setName(title);
+     }
      /** Method called to return a textual representation of a class, which in this case is the collections title.
       * @return A <strong>String</strong> containing the collections title.
       */
      public String toString() {
           return collect_cfg.getName();
+     }
      /** Get the value of a collection argument. */
      private boolean get(String name) {
           boolean result = false;
           try {
                 Element document_element = document.getDocumentElement();
                 NodeList arguments = document_element.getElementsByTagName(ARGUMENT);
                 boolean found = false;
                 for(int i = 0; !found && i < arguments.getLength(); i++) {
                      Element argument_element = (Element) arguments.item(i);
                      if(argument_element.getParentNode() == document_element) {
                           if(argument_element.getAttribute(NAME).equalsIgnoreCase(BUILT)) {
                                 String value = MSMUtils.getValue(argument_element);
                                 if(value.equalsIgnoreCase(TRUE)) {
                                      result = true;
+                                }
                                 found = true;
                                 value = null;
+                          }
+                     }
                      argument_element = null;
+                }
                 arguments = null;
                 document_element = null;
+          }
           catch (Exception error) {
                 Gatherer.printStackTrace(error);
+          }
           return result;
+     }
+        boolean found = false;
+        NodeList mappings = directory_mappings_element.getElementsByTagName(MAPPING);
+        for(int i = 0; !found && i < mappings.getLength(); i++) {
+        Element mapping_element = (Element) mappings.item(i);
+        if(mapping_element.getAttribute(NAME).equalsIgnoreCase(name)) {
+            file = new File(MSMUtils.getValue(mapping_element));
+            directory_mappings_element.removeChild(mapping_element);
+            found = true;
+        }
+        mapping_element = null;
+        }
+        mappings = null;
+        directory_mappings_element = null;
+        document_element = null;
+        saved = false;
+    }
+    catch(Exception error) {
+        Gatherer.printStackTrace(error);
+    }
+    return file;
+    }
+    /** Save this xml document to the given file. */
+    public void save() {
+    Utility.export(document, file);
+    }
+    /** Set the value of built to the given value.
+     * @param value The new value for built, <i>true</i> if the collection has been built successfully, <i>false</i> otherwise.
+     */
+    public void setBuilt(boolean value) {
+    set(BUILT, value);
+    saved = false;
+    }
+    /** Set the value of imported to the given value.
+     * @param value The new value for imported, <i>true</i> if the collection has been imported successfully, <i>false</i> otherwise.
+     */
+    public void setImported(boolean value) {
+    set(IMPORTED, value);
+    saved = false;
+    }
+    /** Set the value of saved to the given value.
+     * @param value The new value for saved, <i>true</i> if the collection has been saved recently, <i>false</i> otherwise.
+     */
+    public void setSaved(boolean value) {
+    saved = value;
+    }
+    /** Set the value of title to the given value.
+     * @param title The new <strong>String</strong> title.
+     */
+    public void setTitle(String title) {
+    collect_cfg.setName(title);
+    }
+    /** Method called to return a textual representation of a class, which in this case is the collections title.
+     * @return A <strong>String</strong> containing the collections title.
+     */
+    public String toString() {
+    return collect_cfg.getName();
+    }
+    /** Get the value of a collection argument. */
+    private boolean get(String name) {
+    boolean result = false;
+    try {
+        Element document_element = document.getDocumentElement();
+        NodeList arguments = document_element.getElementsByTagName(ARGUMENT);
+        boolean found = false;
+        for(int i = 0; !found && i < arguments.getLength(); i++) {
+        Element argument_element = (Element) arguments.item(i);
+        if(argument_element.getParentNode() == document_element) {
+            if(argument_element.getAttribute(NAME).equalsIgnoreCase(BUILT)) {
+            String value = MSMUtils.getValue(argument_element);
+            if(value.equalsIgnoreCase(TRUE)) {
+                result = true;
+            }
+            found = true;
+            value = null;
+            }
+        }
+        argument_element = null;
+        }
+        arguments = null;
+        document_element = null;
+    }
+    catch (Exception error) {
+        Gatherer.printStackTrace(error);
+    }
+    return result;
+    }
      /** Method to retrieve the current build options associated with this Collection. */
      private Element getBuildValues() {
           Element build_values_element = null;
           try {
                 Element document_element = document.getDocumentElement();
                 Element build_config_element = (Element) MSMUtils.getNodeFromNamed(document_element, BUILD_CONFIG);
                 build_values_element = (Element) MSMUtils.getNodeFromNamed(build_config_element, BUILD);
                 build_config_element = null;
                 document_element = null;
+          }
           catch (Exception error) {
                 Gatherer.printStackTrace(error);
+          }
           return build_values_element;
+     }
+    /** Method to retrieve the current build options associated with this Collection. */
+    private Element getBuildValues() {
+    Element build_values_element = null;
+    try {
+        Element document_element = document.getDocumentElement();
+        Element build_config_element = (Element) MSMUtils.getNodeFromNamed(document_element, BUILD_CONFIG);
+        build_values_element = (Element) MSMUtils.getNodeFromNamed(build_config_element, BUILD);
+        build_config_element = null;
+        document_element = null;
+    }
+    catch (Exception error) {
+        Gatherer.printStackTrace(error);
+    }
+    return build_values_element;
+    }
      /** Count either documents or folders, depending on the state of the given boolean. */
      private int getCount(TreeNode node, boolean folders) {
           int count = 0;
           File file = ((FileNode)node).getFile();
           if(file.isFile() && !folders) {
                 count++;
+          }
           else if(file.isDirectory() && folders) {
                 count++;
+          }
           for(int i = 0; i < node.getChildCount(); i++) {
                 count = count + getCount(node.getChildAt(i), folders);
+          }
           return count;
+     }
+    /** Count either documents or folders, depending on the state of the given boolean. */
+    private int getCount(TreeNode node, boolean folders) {
+    int count = 0;
+    File file = ((FileNode)node).getFile();
+    if(file.isFile() && !folders) {
+        count++;
+    }
+    else if(file.isDirectory() && folders) {
+        count++;
+    }
+    for(int i = 0; i < node.getChildCount(); i++) {
+        count = count + getCount(node.getChildAt(i), folders);
+    }
+    return count;
+    }
      /** Method to retrieve the current import options associated with this Collection. */
      public Element getImportValues() {
           Element import_values_element = null;
           try {
                 Element document_element = document.getDocumentElement();
                 Element build_config_element = (Element) MSMUtils.getNodeFromNamed(document_element, BUILD_CONFIG);
                 import_values_element = (Element) MSMUtils.getNodeFromNamed(build_config_element, IMPORT);
                 build_config_element = null;
                 document_element = null;
+          }
           catch (Exception error) {
                 Gatherer.printStackTrace(error);
+          }
           return import_values_element;
+     }
+    /** Method to retrieve the current import options associated with this Collection. */
+    public Element getImportValues() {
+    Element import_values_element = null;
+    try {
+        Element document_element = document.getDocumentElement();
+        Element build_config_element = (Element) MSMUtils.getNodeFromNamed(document_element, BUILD_CONFIG);
+        import_values_element = (Element) MSMUtils.getNodeFromNamed(build_config_element, IMPORT);
+        build_config_element = null;
+        document_element = null;
+    }
+    catch (Exception error) {
+        Gatherer.printStackTrace(error);
+    }
+    return import_values_element;
+    }
      /** Set the value of a collection argument. */
      private void set(String name, boolean value) {
           try {
                 Element document_element = document.getDocumentElement();
                 NodeList arguments = document_element.getElementsByTagName(ARGUMENT);
                 boolean found = false;
                 for(int i = 0; !found && i < arguments.getLength(); i++) {
                      Element argument_element = (Element) arguments.item(i);
                      if(argument_element.getParentNode() == document_element) {
                           if(argument_element.getAttribute(NAME).equalsIgnoreCase(BUILT)) {
                                 // Strip any current value nodes.
                                 while(argument_element.hasChildNodes()) {
                                      argument_element.removeChild(argument_element.getFirstChild());
+                                }
                                 // Append new value
                                 argument_element.appendChild(document.createTextNode(value ? "true" : "false"));
+                          }
+                     }
                      argument_element = null;
+                }
                 arguments = null;
                 document_element = null;
+          }
           catch (Exception error) {
                 Gatherer.printStackTrace(error);
+          }
+     }
+    /** Set the value of a collection argument. */
+    private void set(String name, boolean value) {
+    try {
+        Element document_element = document.getDocumentElement();
+        NodeList arguments = document_element.getElementsByTagName(ARGUMENT);
+        boolean found = false;
+        for(int i = 0; !found && i < arguments.getLength(); i++) {
+        Element argument_element = (Element) arguments.item(i);
+        if(argument_element.getParentNode() == document_element) {
+            if(argument_element.getAttribute(NAME).equalsIgnoreCase(BUILT)) {
+            // Strip any current value nodes.
+            while(argument_element.hasChildNodes()) {
+                argument_element.removeChild(argument_element.getFirstChild());
+            }
+            // Append new value
+            argument_element.appendChild(document.createTextNode(value ? "true" : "false"));
+            }
+        }
+        argument_element = null;
+        }
+        arguments = null;
+        document_element = null;
+    }
+    catch (Exception error) {
+        Gatherer.printStackTrace(error);
+    }
+    }
+}

trunk/gli/src/org/greenstone/gatherer/collection/CollectionConfiguration.java

-              r4293
+              r4366
 public class CollectionConfiguration {
      private Element creator_element;
      private Element description_element;
      private Element maintainer_element;
      private Element name_element;
      private String creator;
      private String description;
      private String maintainer;
      private String name;
+    private Element creator_element;
+    private Element description_element;
+    private Element maintainer_element;
+    private Element name_element;
+    private String creator;
+    private String description;
+    private String maintainer;
+    private String name;
      public CollectionConfiguration(File file) {
           try {
                 String filename = file.getName().toLowerCase();
                 if(filename.endsWith(".xml")) {
+    public CollectionConfiguration(File file) {
+    try {
+        String filename = file.getName().toLowerCase();
+        if(filename.endsWith(".xml")) {
+        }
+        else if(filename.endsWith(".cfg")) {
+        FileReader fr = new FileReader(file);
+        BufferedReader br = new BufferedReader(fr);
+        String command = null;
+        while((command = br.readLine()) != null) {
+            if(command.length() > 0) {
+            // We have to test the end of command for the special character '\'. If found, remove it and append the next line, then repeat.
+            while(command.trim().endsWith("\\")) {
+                command = command.substring(0, command.lastIndexOf("\\"));
+                String next_line = br.readLine();
+                if(next_line != null) {
+                command = command + next_line;
+                }
+                next_line = null;
+            }
+            CommandTokenizer tokenizer = new CommandTokenizer(command);
+            if(tokenizer.countTokens() >= 2) {
+                String temp = tokenizer.nextToken();
+                if(temp.equalsIgnoreCase("creator")) {
+                creator = tokenizer.nextToken();
+                }
+                else if(temp.equalsIgnoreCase("maintainer")) {
+                maintainer = tokenizer.nextToken();
+                }
+                else if(temp.equalsIgnoreCase("collectionmeta")) {
+                temp = tokenizer.nextToken();
+                if(temp.equalsIgnoreCase("collectionname")) {
+                    temp = tokenizer.nextToken();
+                    if(temp.startsWith("[") && temp.endsWith("]")) {
+                    String language = temp.substring(temp.indexOf("=") + 1, temp.length() - 1);
+                    if(name == null || language.equalsIgnoreCase(Gatherer.dictionary.getLanguage())) {
+                        name = Utility.decodeGreenstone(tokenizer.nextToken());
+                    }
+                    }
+                    else if(name == null) {
+                    name = Utility.decodeGreenstone(temp);
+                    }
+                    if(name != null && name.startsWith("\"") && name.endsWith("\"")) {
+                    name = name.substring(1, name.length() - 1);
+                    }
+                }
+                else if(filename.endsWith(".cfg")) {
+                     FileReader fr = new FileReader(file);
+                     BufferedReader br = new BufferedReader(fr);
+                     String command = null;
+                     while((command = br.readLine()) != null) {
+                          if(command.length() > 0) {
+                                // We have to test the end of command for the special character '\'. If found, remove it and append the next line, then repeat.
+                                while(command.trim().endsWith("\\")) {
+                                     command = command.substring(0, command.lastIndexOf("\\"));
+                                     String next_line = br.readLine();
+                                     if(next_line != null) {
+                                          command = command + next_line;
+                                     }
+                                     next_line = null;
+                                }
+                                CommandTokenizer tokenizer = new CommandTokenizer(command);
+                                if(tokenizer.countTokens() >= 2) {
+                                     String temp = tokenizer.nextToken();
+                                     if(temp.equalsIgnoreCase("creator")) {
+                                          creator = tokenizer.nextToken();
+                                     }
+                                     else if(temp.equalsIgnoreCase("maintainer")) {
+                                          maintainer = tokenizer.nextToken();
+                                     }
+                                     else if(temp.equalsIgnoreCase("collectionmeta")) {
+                                          temp = tokenizer.nextToken();
+                                          if(temp.equalsIgnoreCase("collectionname")) {
+                                                temp = tokenizer.nextToken();
+                                                if(temp.startsWith("[") && temp.endsWith("]")) {
+                                                     String language = temp.substring(temp.indexOf("=") + 1, temp.length() - 1);
+                                                     if(name == null || language.equalsIgnoreCase(Gatherer.dictionary.getLanguage())) {
+                                                          name = Utility.decodeGreenstone(tokenizer.nextToken());
+                                                     }
+                                                }
+                                                else if(name == null) {
+                                                     name = Utility.decodeGreenstone(temp);
+                                                }
+                                                if(name != null && name.startsWith("\"") && name.endsWith("\"")) {
+                                                     name = name.substring(1, name.length() - 1);
+                                                }
+                                          }
+                                          else if(temp.equalsIgnoreCase("collectionextra")) {
+                                                temp = tokenizer.nextToken();
+                                                ///ystem.err.println("Read: " + temp);
+                                                if(temp.startsWith("[") && temp.endsWith("]")) {
+                                                     String language = temp.substring(temp.indexOf("=") + 1, temp.length() - 1);
+                                                     ///ystem.err.println("Try to match " + language + " to " + Gatherer.dictionary.getLanguage());
+                                                     if(description == null || language.equalsIgnoreCase(Gatherer.dictionary.getLanguage())) {
+                                                          description = Utility.decodeGreenstone(tokenizer.nextToken());
+                                                          ///ystem.err.println("Found language match, or first match: " + description);
+                                                     }
+                                                }
+                                                else if(description == null) {
+                                                     description = Utility.decodeGreenstone(temp);
+                                                     ///ystem.err.println("Found first match: " + description);
+                                                }
+                                                if(description != null && description.startsWith("\"") && description.endsWith("\"")) {
+                                                     description = description.substring(1, description.length() - 1);
+                                                }
+                                          }
+                                     }
+                                     temp = null;
+                                }
+                                tokenizer = null;
+                          }
+                     }
+                     command = null;
+                     br.close();
+                     br = null;
+                     fr.close();
+                     fr = null;
+                else if(temp.equalsIgnoreCase("collectionextra")) {
+                    temp = tokenizer.nextToken();
+                    ///ystem.err.println("Read: " + temp);
+                    if(temp.startsWith("[") && temp.endsWith("]")) {
+                    String language = temp.substring(temp.indexOf("=") + 1, temp.length() - 1);
+                    ///ystem.err.println("Try to match " + language + " to " + Gatherer.dictionary.getLanguage());
+                    if(description == null || language.equalsIgnoreCase(Gatherer.dictionary.getLanguage())) {
+                        description = Utility.decodeGreenstone(tokenizer.nextToken());
+                        ///ystem.err.println("Found language match, or first match: " + description);
+                    }
+                    }
+                    else if(description == null) {
+                    description = Utility.decodeGreenstone(temp);
+                    ///ystem.err.println("Found first match: " + description);
+                    }
+                    if(description != null && description.startsWith("\"") && description.endsWith("\"")) {
+                    description = description.substring(1, description.length() - 1);
+                    }
+                }
+                }
+                temp = null;
+            }
+            tokenizer = null;
+            }
+        }
+        command = null;
+        br.close();
+        br = null;
+        fr.close();
+        fr = null;
+        }
                 ///ystem.err.println("Parsed collect.cfg");
                 ///ystem.err.println("name        = " + name);
 …
                 ///ystem.err.println("maintainer  = " + maintainer);
                 ///ystem.err.println("description = " + description);
+          }
           catch(Exception error) {
                 Gatherer.println("Error in CollectionConfiguration.<init>(): " + error);
                 Gatherer.printStackTrace(error);
+          }
+     }
+    }
+    catch(Exception error) {
+        Gatherer.println("Error in CollectionConfiguration.<init>(): " + error);
+        Gatherer.printStackTrace(error);
+    }
+    }
      public String getCreator() {
           String result = "";
           if(creator_element != null) {
                 result = MSMUtils.getValue(creator_element);
+          }
           else if(creator != null) {
                 result = creator;
+          }
           return result;
+     }
+    public String getCreator() {
+    String result = "";
+    if(creator_element != null) {
+        result = MSMUtils.getValue(creator_element);
+    }
+    else if(creator != null) {
+        result = creator;
+    }
+    return result;
+    }
      public String getDescription() {
           String result = "";
           if(description_element != null) {
                 result = MSMUtils.getValue(description_element);
+          }
           else if(description != null) {
                 result = description;
+          }
           return result;
+     }
+    public String getDescription() {
+    String result = "";
+    if(description_element != null) {
+        result = MSMUtils.getValue(description_element);
+    }
+    else if(description != null) {
+        result = description;
+    }
+    return result;
+    }
      public String getMaintainer() {
           String result = "";
           if(maintainer_element != null) {
                 result = MSMUtils.getValue(maintainer_element);
+          }
           else if(maintainer != null) {
                 result = maintainer;
+          }
           return result;
+     }
+    public String getMaintainer() {
+    String result = "";
+    if(maintainer_element != null) {
+        result = MSMUtils.getValue(maintainer_element);
+    }
+    else if(maintainer != null) {
+        result = maintainer;
+    }
+    return result;
+    }
      public String getName() {
           String result = "Error";
           if(name_element != null) {
                 result = MSMUtils.getValue(name_element);
+          }
           else if(name != null) {
                 result = name;
+          }
           return result;
+     }
+    public String getName() {
+    String result = "Error";
+    if(name_element != null) {
+        result = MSMUtils.getValue(name_element);
+    }
+    else if(name != null) {
+        result = name;
+    }
+    return result;
+    }
      public void setName(String name) {
           /** @todo */
+     }
+    public void setName(String name) {
+    /** @todo */
+    }
+}

trunk/gli/src/org/greenstone/gatherer/collection/CollectionManager.java

-              r4351
+              r4366
  */
 public class CollectionManager
      implements GShellListener, MSMListener {
      /** A reference to the metadata set manager.
       * @deprecated
       */
      public MetadataSetManager msm;
      /** A reference to the undo manager. Although only one instance is shared between all collections, the undo queues are emptied between each. */
      public UndoManager undo;
      /** Are we currently in the process of building? */
      private boolean building = false;
      /** Are we currently in the process of importing? */
      private boolean importing = false;
      /** The collection this manager is managing! */
      private Collection collection = null;
      /** The collection_model. */
      private FileSystemModel collection_model = null;
      /** The workspace model. This becomes invalid on a collection change. */
      private FileSystemModel workspace_model = null;
      /** An inner class listener responsible for noting tree changes and resetting saved when they occur. */
      private FMTreeModelListener fm_tree_model_listener = null;
      /** The monitor resposible for parsing the build process. */
      private GShellProgressMonitor build_monitor = null;
      /** The monitor resposible for parsing the copy process. */
      private GShellProgressMonitor copy_monitor = null;
      /** The monitor resposible for parsing the import process. */
      private GShellProgressMonitor import_monitor = null;
      private int special_case = -1;
      /** The name of the standard lock file. */
      static final public String LOCK_FILE = "gatherer.lck";
      static final public int NO_SPECIAL_CASE = -1;
      static final public int SPECIAL_DLS = 0;
      /** Constructor. */
      public CollectionManager() {
           // Initialisation.
           this.building = false;
           this.importing = false;
           this.collection = null;
           this.undo = new UndoManager();
+     }
      /** Add a special directory mapping.
+    implements GShellListener, MSMListener {
+    /** A reference to the metadata set manager.
+     * @deprecated
+     */
+    public MetadataSetManager msm;
+    /** A reference to the undo manager. Although only one instance is shared between all collections, the undo queues are emptied between each. */
+    public UndoManager undo;
+    /** Are we currently in the process of building? */
+    private boolean building = false;
+    /** Are we currently in the process of importing? */
+    private boolean importing = false;
+    /** The collection this manager is managing! */
+    private Collection collection = null;
+    /** The collection_model. */
+    private FileSystemModel collection_model = null;
+    /** The workspace model. This becomes invalid on a collection change. */
+    private FileSystemModel workspace_model = null;
+    /** An inner class listener responsible for noting tree changes and resetting saved when they occur. */
+    private FMTreeModelListener fm_tree_model_listener = null;
+    /** The monitor resposible for parsing the build process. */
+    private GShellProgressMonitor build_monitor = null;
+    /** The monitor resposible for parsing the copy process. */
+    private GShellProgressMonitor copy_monitor = null;
+    /** The monitor resposible for parsing the import process. */
+    private GShellProgressMonitor import_monitor = null;
+    private int special_case = -1;
+    /** The name of the standard lock file. */
+    static final public String LOCK_FILE = "gatherer.lck";
+    static final public int NO_SPECIAL_CASE = -1;
+    static final public int SPECIAL_DLS = 0;
+    /** Constructor. */
+    public CollectionManager() {
+    // Initialisation.
+    this.building = false;
+    this.importing = false;
+    this.collection = null;
+    this.undo = new UndoManager();
+    }
+    /** Add a special directory mapping.
       * @param name The name for this directory mapping as a <strong>String</strong>.
       * @param file The directory this mapping maps to as a <strong>File</strong>.
       */
      public void addDirectoryMapping(String name, File file) {
           if(ready()) {
+    public void addDirectoryMapping(String name, File file) {
+    if(ready()) {
                 // Update the information stored in the collection
                 collection.addDirectoryMapping(name, file);
+        collection.addDirectoryMapping(name, file);
                 // Now update the tree
                 FileSystemModel model = (FileSystemModel) Gatherer.g_man.collection_pane.getWorkspaceTree().getModel();
                 FileNode parent = (FileNode) model.getRoot();
                 FileNode target = new FileNode(file, name);
                 SynchronizedTreeModelTools.insertNodeInto(model, parent, target);
+          }
+     }
      /** This method calls the builcol.pl scripts via a GShell so as to not lock up the processor.
+        FileSystemModel model = (FileSystemModel) Gatherer.g_man.collection_pane.getWorkspaceTree().getModel();
+        FileNode parent = (FileNode) model.getRoot();
+        FileNode target = new FileNode(file, name);
+        SynchronizedTreeModelTools.insertNodeInto(model, parent, target);
+    }
+    }
+    /** This method calls the builcol.pl scripts via a GShell so as to not lock up the processor.
       * @see org.greenstone.gatherer.Configuration
       * @see org.greenstone.gatherer.Gatherer
 …
       * @see org.greenstone.gatherer.util.Utility
       */
      public void buildCollection() {
           Gatherer.println("Building collection");
           building = true;
           String args[];
           if(Utility.isWindows()) {
               args = new String[4];
                 args[0] = Gatherer.config.perl_path;
               args[1] = "-S";
               args[2] = Gatherer.config.getScriptPath() + "buildcol.pl";
               args[3] = collection.getName();
+          }
           else {
               args = new String[2];
               args[0] = Gatherer.config.getScriptPath() + "buildcol.pl";
               args[1] = collection.getName();
+          }
           args = ArrayTools.add(args, collection.build_options.getBuildValues());
           GShell shell = new GShell(args, GShell.BUILD, Message.BUILDING, this, build_monitor, GShell.GSHELL_BUILD);
           shell.addGShellListener(Gatherer.g_man.create_pane);
           shell.start();
+     }
      /** Used to determine whether the currently active collection has been built.
+    public void buildCollection() {
+    Gatherer.println("Building collection");
+    building = true;
+    String args[];
+    if(Utility.isWindows()) {
+        args = new String[4];
+        args[0] = Gatherer.config.perl_path;
+        args[1] = "-S";
+        args[2] = Gatherer.config.getScriptPath() + "buildcol.pl";
+        args[3] = collection.getName();
+    }
+    else {
+        args = new String[2];
+        args[0] = Gatherer.config.getScriptPath() + "buildcol.pl";
+        args[1] = collection.getName();
+    }
+    args = ArrayTools.add(args, collection.build_options.getBuildValues());
+    GShell shell = new GShell(args, GShell.BUILD, Message.BUILDING, this, build_monitor, GShell.GSHELL_BUILD);
+    shell.addGShellListener(Gatherer.g_man.create_pane);
+    shell.start();
+    }
+    /** Used to determine whether the currently active collection has been built.
       * @return A boolean indicating the built status of the collection.
       */
      public boolean built() {
           if(collection != null) {
                 return collection.getBuilt();
+          }
           return false;
+     }
      /** Called to close the current collection and remove its lock file.
       * @see org.greenstone.gatherer.Gatherer
       * @see org.greenstone.gatherer.collection.Collection
       * @see org.greenstone.gatherer.util.Utility
       */
      public void closeCollection() {
           // Remove the lock on this file, then remove the collection.
           File lock_file = new File(Utility.getCollectionDir(Gatherer.config.gsdl_path) + collection.getName() + File.separator + LOCK_FILE);
           lock_file.delete();
           collection.msm.destroy();
           collection = null;
           collection_model = null;
           workspace_model = null;
           undo.clear();
           Gatherer.config.setCollectionConfiguration(null);
           Gatherer.g_man.collectionChanged(false);
+     }
      /** Method that is called whenever something has changed in the configuration of this collection. */
      public void configurationChanged() {
           if(collection != null) {
                 collection.setSaved(false);
+          }
+     }
      /** Used to set the current collection to the given collection. Note that this call should -always- be proceeded by a ready call, and if the colection is ready and the saved flag is unset then the user should be prompted to save. Also note that this method creates yet another GShell to run buildcol.pl. */
      public void createCollection(String description, String email, String name, String title, File base_collection_directory, ArrayList metadata_sets) {
           special_case = NO_SPECIAL_CASE;
           try {
+    public boolean built() {
+    if(collection != null) {
+        return collection.getBuilt();
+    }
+    return false;
+    }
+    /** Called to close the current collection and remove its lock file.
+      * @see org.greenstone.gatherer.Gatherer
+      * @see org.greenstone.gatherer.collection.Collection
+      * @see org.greenstone.gatherer.util.Utility
+      */
+    public void closeCollection() {
+    // Remove the lock on this file, then remove the collection.
+    File lock_file = new File(Utility.getCollectionDir(Gatherer.config.gsdl_path) + collection.getName() + File.separator + LOCK_FILE);
+    lock_file.delete();
+    collection.msm.destroy();
+    collection = null;
+    collection_model = null;
+    workspace_model = null;
+    undo.clear();
+    Gatherer.config.setCollectionConfiguration(null);
+    Gatherer.g_man.collectionChanged(false);
+    }
+    /** Method that is called whenever something has changed in the configuration of this collection. */
+    public void configurationChanged() {
+    if(collection != null) {
+        collection.setSaved(false);
+    }
+    }
+    /** Used to set the current collection to the given collection. Note that this call should -always- be proceeded by a ready call, and if the colection is ready and the saved flag is unset then the user should be prompted to save. Also note that this method creates yet another GShell to run buildcol.pl. */
+    public void createCollection(String description, String email, String name, String title, File base_collection_directory, ArrayList metadata_sets) {
+    special_case = NO_SPECIAL_CASE;
+    try {
                 // Create a progress monitor.
                 ProgressMonitor progress = new ProgressMonitor(Gatherer.g_man, get("Creating_New"), "mkcol.pl", 0, 7);
+        ProgressMonitor progress = new ProgressMonitor(Gatherer.g_man, get("Creating_New"), "mkcol.pl", 0, 7);
                 // Create the new collection.
                 makeCollection(description, email, name, title);
                 progress.setProgress(1);
+        makeCollection(description, email, name, title);
+        progress.setProgress(1);
                 // ACTIVE_DIR/gimport/
                 String a_dir = Utility.getCollectionDir(Gatherer.config.gsdl_path) + name + File.separator;
+        String a_dir = Utility.getCollectionDir(Gatherer.config.gsdl_path) + name + File.separator;
                 // Has to be done before creating greenstone directory metadata manager.
                 File gimport_dir_temp = new File(Utility.getImportDir(a_dir)+"temp.dat");
                 File gimport_dir = gimport_dir_temp.getParentFile();
                 gimport_dir.mkdirs();
                 if(progress != null) {
                      progress.setNote(get("Gimport_Created"));
+                }
+        File gimport_dir_temp = new File(Utility.getImportDir(a_dir)+"temp.dat");
+        File gimport_dir = gimport_dir_temp.getParentFile();
+        gimport_dir.mkdirs();
+        if(progress != null) {
+        progress.setNote(get("Gimport_Created"));
+        }
                 // ACTIVE_DIR/gcache/
                 File gcache_dir_temp = new File(Utility.getCacheDir(a_dir)+"temp.dat");
                 File gcache_dir = gcache_dir_temp.getParentFile();
                 gcache_dir.mkdirs();
                 if(progress != null) {
                      progress.setNote(get("Gcache_Created"));
+                }
+        File gcache_dir_temp = new File(Utility.getCacheDir(a_dir)+"temp.dat");
+        File gcache_dir = gcache_dir_temp.getParentFile();
+        gcache_dir.mkdirs();
+        if(progress != null) {
+        progress.setNote(get("Gcache_Created"));
+        }
                 // ACTIVE_DIR/log/
                 File log_dir_temp = new File(Utility.getLogDir(a_dir)+"temp.dat");
                 File log_dir = log_dir_temp.getParentFile();
                 log_dir.mkdirs();
                 if(progress != null) {
                     progress.setNote(get("Log_Created"));
+                }
+        File log_dir_temp = new File(Utility.getLogDir(a_dir)+"temp.dat");
+        File log_dir = log_dir_temp.getParentFile();
+        log_dir.mkdirs();
+        if(progress != null) {
+        progress.setNote(get("Log_Created"));
+        }
                 progress.setProgress(2);
+        progress.setProgress(2);
                 // Now create the collection object around the directory.
                 collection = new Collection(new File(a_dir, name + ".col"));
                 collection.msm = new MetadataSetManager();
                 msm = collection.msm; // Legacy
                 collection.msm.load();
+        collection = new Collection(new File(a_dir, name + ".col"));
+        collection.msm = new MetadataSetManager();
+        msm = collection.msm; // Legacy
+        collection.msm.load();
                 // Import default metadata sets if any.
                 for(int i = 0; metadata_sets != null && i < metadata_sets.size(); i++) {
                      MetadataSet metadata_set = (MetadataSet) metadata_sets.get(i);
                      collection.msm.importMDS(metadata_set.getFile(), false);
+                }
+        for(int i = 0; metadata_sets != null && i < metadata_sets.size(); i++) {
+        MetadataSet metadata_set = (MetadataSet) metadata_sets.get(i);
+        collection.msm.importMDS(metadata_set.getFile(), false);
+        }
                 // Before we create the CollectionDesignManager we have to check if we are basing it upon some other collection.
                 if(base_collection_directory != null) {
                      // If so our first step is to correctly generate an import profile for our collection from this base collection.
                      // Try to import any existing metadata sets for this collection. Look in base_collection_directory/metadata and import any metadata sets found.
                      File base_metadata = new File(base_collection_directory, Utility.METADATA_DIR);
                      if(base_metadata.exists()) {
                           File[] possible_metadata_sets = base_metadata.listFiles();
                           for(int i = 0; possible_metadata_sets != null && i < possible_metadata_sets.length; i++) {
                                 String filename = possible_metadata_sets[i].getName();
                                 if(filename.endsWith(".mds")) {
                                      ///ystem.err.println("Found a metadata set. Importing: " + possible_metadata_sets[i].getAbsolutePath());
                                      collection.msm.importMDS(possible_metadata_sets[i], false);
+                                }
+                          }
+                     }
                      // If no sets were imported, then create a new metadata with this new collections name. Note that if this is one of the 'big five' collections then I already know the importing mappings as well.
                      boolean skip_import_phase = false;
                      if(collection.msm.getSets().size() == 0) {
                           CollectionConfiguration col_con = new CollectionConfiguration(new File(base_collection_directory, Utility.CONFIG_DIR));
                           // If the source collection is one of the 'big five' then we know what the metadata set is.
                           String collection_name = col_con.getName();
                           // Demo collection - part of the DLS
                           if(collection_name.equals(Utility.COLLECTION_DEMO) || collection_name.equals(Utility.COLLECTION_DLS)) {
                                 special_case = SPECIAL_DLS;
                                 String demo_directory = (new File(base_collection_directory.getParentFile(), Utility.COLLECTION_DEMO_DIRECTORY)).getAbsolutePath();
                                 String dls_directory = (new File(base_collection_directory.getParentFile(), Utility.COLLECTION_DLS_DIRECTORY)).getAbsolutePath();
                                 // Add the dls.mds
                                 collection.msm.importMDS(new File(Utility.METADATA_DIR + Utility.DLS_MDS), false);
                                 // Add the mappings for the dls (even if its not present).
                                 collection.msm.profiler.addAction(dls_directory, "AZList", "dls.AZList");
                                 collection.msm.profiler.addAction(dls_directory, "Keyword", "dls.Keyword");
                                 collection.msm.profiler.addAction(dls_directory, "Language", "dls.Language");
                                 collection.msm.profiler.addAction(dls_directory, "Organization", "dls.Organization");
                                 collection.msm.profiler.addAction(dls_directory, "Subject", "dls.Subject");
                                 collection.msm.profiler.addAction(dls_directory, "Title", "dls.Title");
                                 // Add the mappings for the demo dls (even if its not present).
                                 collection.msm.profiler.addAction(demo_directory, "AZList", "dls.AZList");
                                 collection.msm.profiler.addAction(demo_directory, "Keyword", "dls.Keyword");
                                 collection.msm.profiler.addAction(demo_directory, "Language", "dls.Language");
                                 collection.msm.profiler.addAction(demo_directory, "Organization", "dls.Organization");
                                 collection.msm.profiler.addAction(demo_directory, "Subject", "dls.Subject");
                                 collection.msm.profiler.addAction(demo_directory, "Title", "dls.Title");
                                 // Skip the import phase
                                 skip_import_phase = true;
+                          }
                           // Prompt the user so that they can choose at least one initial metadata set. We're sneaky here and just create a ncm_prompt
                           else {
                                 NewCollectionMetadataPrompt ncm_prompt = new NewCollectionMetadataPrompt();
                                 // If cancelled then they really do mean to start a collection with no metadata sets.
                                 if(!ncm_prompt.isCancelled()) {
                                      ArrayList initial_sets = ncm_prompt.getSets();
                                      for(int i = 0; initial_sets != null && i < initial_sets.size(); i++) {
                                           MetadataSet metadata_set = (MetadataSet) initial_sets.get(i);
                                           collection.msm.importMDS(metadata_set.getFile(), false);
                                           metadata_set = null;
+                                     }
                                      initial_sets = null;
+                                }
                                 ncm_prompt.dispose();
                                 ncm_prompt = null;
+                          }
+                     }
                      // Do a dry metadata import run over the entire base collection, recording profile mappings. We do this by finding the archive files, and then iterating over them using the GreenstoneArchiveParser to retrieve metadata from them. We then process the importing of new metadata elements using the selectElement prompt used in a file action metadata import. However the big change is that we don't actually import any metadata, just create importing profiles.
                      File base_archives = new File(base_collection_directory, Utility.ARCHIVE_DIR);
                      if(!skip_import_phase && base_archives.exists()) {
                           ///ystem.err.println("Found archives directory.");
+                     }
                      // Failing that we do a dummy run over the files in the collection.
                      else if(!skip_import_phase) {
                           ///ystem.err.println("No archives directory. Searching files for metadata.xml information.");
                           // Find the import directory
                           File base_import = new File(base_collection_directory, Utility.IMPORT_DIR);
                           if(!base_import.exists()) {
                                 base_import = new File(base_collection_directory, Utility.OLD_IMPORT_DIR);
+                          }
                           if(base_import.exists()) {
                                 searchForMetadata(base_import);
+                          }
                           // And if that fails then we must have been asked by Satan himself to build the very digital collections of hell, because they don't match any goodly greenstone collection I have ever seen, so you can't blame me if I can't import them.
+                     }
                      // Now we update our collect.cfg
                      updateCollectionCFG(new File(base_collection_directory, Utility.CONFIG_DIR), new File(a_dir, Utility.CONFIG_DIR), description, email, title);
+                }
                 collection.cdm = new CollectionDesignManager();
                 collection.gdm = new GDMManager();
                 progress.setProgress(3);
+        if(base_collection_directory != null) {
+        // If so our first step is to correctly generate an import profile for our collection from this base collection.
+        // Try to import any existing metadata sets for this collection. Look in base_collection_directory/metadata and import any metadata sets found.
+        File base_metadata = new File(base_collection_directory, Utility.METADATA_DIR);
+        if(base_metadata.exists()) {
+            File[] possible_metadata_sets = base_metadata.listFiles();
+            for(int i = 0; possible_metadata_sets != null && i < possible_metadata_sets.length; i++) {
+            String filename = possible_metadata_sets[i].getName();
+            if(filename.endsWith(".mds")) {
+                ///ystem.err.println("Found a metadata set. Importing: " + possible_metadata_sets[i].getAbsolutePath());
+                collection.msm.importMDS(possible_metadata_sets[i], false);
+            }
+            }
+        }
+        // If no sets were imported, then create a new metadata with this new collections name. Note that if this is one of the 'big five' collections then I already know the importing mappings as well.
+        boolean skip_import_phase = false;
+        if(collection.msm.getSets().size() == 0) {
+            CollectionConfiguration col_con = new CollectionConfiguration(new File(base_collection_directory, Utility.CONFIG_DIR));
+            // If the source collection is one of the 'big five' then we know what the metadata set is.
+            String collection_name = col_con.getName();
+            // Demo collection - part of the DLS
+            if(collection_name.equals(Utility.COLLECTION_DEMO) || collection_name.equals(Utility.COLLECTION_DLS)) {
+            special_case = SPECIAL_DLS;
+            String demo_directory = (new File(base_collection_directory.getParentFile(), Utility.COLLECTION_DEMO_DIRECTORY)).getAbsolutePath();
+            String dls_directory = (new File(base_collection_directory.getParentFile(), Utility.COLLECTION_DLS_DIRECTORY)).getAbsolutePath();
+            // Add the dls.mds
+            collection.msm.importMDS(new File(Utility.METADATA_DIR + Utility.DLS_MDS), false);
+            // Add the mappings for the dls (even if its not present).
+            collection.msm.profiler.addAction(dls_directory, "AZList", "dls.AZList");
+            collection.msm.profiler.addAction(dls_directory, "Keyword", "dls.Keyword");
+            collection.msm.profiler.addAction(dls_directory, "Language", "dls.Language");
+            collection.msm.profiler.addAction(dls_directory, "Organization", "dls.Organization");
+            collection.msm.profiler.addAction(dls_directory, "Subject", "dls.Subject");
+            collection.msm.profiler.addAction(dls_directory, "Title", "dls.Title");
+            // Add the mappings for the demo dls (even if its not present).
+            collection.msm.profiler.addAction(demo_directory, "AZList", "dls.AZList");
+            collection.msm.profiler.addAction(demo_directory, "Keyword", "dls.Keyword");
+            collection.msm.profiler.addAction(demo_directory, "Language", "dls.Language");
+            collection.msm.profiler.addAction(demo_directory, "Organization", "dls.Organization");
+            collection.msm.profiler.addAction(demo_directory, "Subject", "dls.Subject");
+            collection.msm.profiler.addAction(demo_directory, "Title", "dls.Title");
+            // Skip the import phase
+            skip_import_phase = true;
+            }
+            // Prompt the user so that they can choose at least one initial metadata set. We're sneaky here and just create a ncm_prompt
+            else {
+            NewCollectionMetadataPrompt ncm_prompt = new NewCollectionMetadataPrompt();
+            // If cancelled then they really do mean to start a collection with no metadata sets.
+            if(!ncm_prompt.isCancelled()) {
+                ArrayList initial_sets = ncm_prompt.getSets();
+                for(int i = 0; initial_sets != null && i < initial_sets.size(); i++) {
+                MetadataSet metadata_set = (MetadataSet) initial_sets.get(i);
+                collection.msm.importMDS(metadata_set.getFile(), false);
+                metadata_set = null;
+                }
+                initial_sets = null;
+            }
+            ncm_prompt.dispose();
+            ncm_prompt = null;
+            }
+        }
+        // Do a dry metadata import run over the entire base collection, recording profile mappings. We do this by finding the archive files, and then iterating over them using the GreenstoneArchiveParser to retrieve metadata from them. We then process the importing of new metadata elements using the selectElement prompt used in a file action metadata import. However the big change is that we don't actually import any metadata, just create importing profiles.
+        File base_archives = new File(base_collection_directory, Utility.ARCHIVE_DIR);
+        if(!skip_import_phase && base_archives.exists()) {
+            ///ystem.err.println("Found archives directory.");
+        }
+        // Failing that we do a dummy run over the files in the collection.
+        else if(!skip_import_phase) {
+            ///ystem.err.println("No archives directory. Searching files for metadata.xml information.");
+            // Find the import directory
+            File base_import = new File(base_collection_directory, Utility.IMPORT_DIR);
+            if(!base_import.exists()) {
+            base_import = new File(base_collection_directory, Utility.OLD_IMPORT_DIR);
+            }
+            if(base_import.exists()) {
+            searchForMetadata(base_import);
+            }
+            // And if that fails then we must have been asked by Satan himself to build the very digital collections of hell, because they don't match any goodly greenstone collection I have ever seen, so you can't blame me if I can't import them.
+        }
+        // Now we update our collect.cfg
+        updateCollectionCFG(new File(base_collection_directory, Utility.CONFIG_DIR), new File(a_dir, Utility.CONFIG_DIR), description, email, title);
+        }
+        collection.cdm = new CollectionDesignManager();
+        collection.gdm = new GDMManager();
+        progress.setProgress(3);
                 // Has to be done after creating metadata set manager.
                 File gmeta_dir_temp = new File(getCollectionMetadata()+"temp.dat");
                 File gmeta_dir = gmeta_dir_temp.getParentFile();
                 gmeta_dir.mkdirs();
                 if(progress != null) {
                      progress.setNote("GMeta created");
+                }
                 progress.setProgress(4);
                 progress.setProgress(6);
+        File gmeta_dir_temp = new File(getCollectionMetadata()+"temp.dat");
+        File gmeta_dir = gmeta_dir_temp.getParentFile();
+        gmeta_dir.mkdirs();
+        if(progress != null) {
+        progress.setNote("GMeta created");
+        }
+        progress.setProgress(4);
+        progress.setProgress(6);
                 // Register ourselves as being interested in what the msm has to say.
                 collection.msm.addMSMListener(this);
+        collection.msm.addMSMListener(this);
                 // Create a lock file.
                 File lock_file = new File(a_dir, LOCK_FILE);
                 FileOutputStream out = new FileOutputStream(lock_file);
                 out.write(LOCK_FILE.getBytes());
                 out.close();
                 out = null;
                 progress.setProgress(7);
                 String args[] = new String[1];
                 args[0] = name;
                 progress.setNote(get("Session_Ready", args));
                 progress.close();
+          }
           catch (Exception error) {
                 Gatherer.printStackTrace(error);
+          }
           // Done.
           if(Gatherer.g_man != null) {
                 workspace_model = null;
                 Gatherer.g_man.collectionChanged(ready());
+          }
+     }
      public void createLockFile(File destination) {
           try {
                 Document default_lockfile = Utility.parse("xml" + File.separator + LOCK_FILE, true);
                 String user_name = System.getProperty("user.name");
                 Element person_element = (Element) MSMUtils.getNodeFromNamed(default_lockfile.getDocumentElement(), "User");
                 person_element.appendChild(default_lockfile.createTextNode(user_name));
                 person_element = null;
                 user_name = null;
                 String machine_name = Utility.getMachineName();
                 Element machine_element = (Element) MSMUtils.getNodeFromNamed(default_lockfile.getDocumentElement(), "Machine");
                 machine_element.appendChild(default_lockfile.createTextNode(machine_name));
                 machine_element = null;
                 machine_name = null;
                 String date_time = Utility.getDateString();
                 Element date_element = (Element) MSMUtils.getNodeFromNamed(default_lockfile.getDocumentElement(), "Date");
                 date_element.appendChild(default_lockfile.createTextNode(date_time));
                 date_element = null;
                 date_time = null;
                 Utility.export(default_lockfile, destination);
+          }
           catch (Exception error) {
                 Gatherer.printStackTrace(error);
+          }
+     }
      /** Method that is called whenever an element within a set is changed or modified. We want to mark the collection so that it needs saving again.
+        File lock_file = new File(a_dir, LOCK_FILE);
+        FileOutputStream out = new FileOutputStream(lock_file);
+        out.write(LOCK_FILE.getBytes());
+        out.close();
+        out = null;
+        progress.setProgress(7);
+        String args[] = new String[1];
+        args[0] = name;
+        progress.setNote(get("Session_Ready", args));
+        progress.close();
+    }
+    catch (Exception error) {
+        Gatherer.printStackTrace(error);
+    }
+    // Done.
+    if(Gatherer.g_man != null) {
+        workspace_model = null;
+        Gatherer.g_man.collectionChanged(ready());
+    }
+    }
+    public void createLockFile(File destination) {
+    try {
+        Document default_lockfile = Utility.parse("xml" + File.separator + LOCK_FILE, true);
+        String user_name = System.getProperty("user.name");
+        Element person_element = (Element) MSMUtils.getNodeFromNamed(default_lockfile.getDocumentElement(), "User");
+        person_element.appendChild(default_lockfile.createTextNode(user_name));
+        person_element = null;
+        user_name = null;
+        String machine_name = Utility.getMachineName();
+        Element machine_element = (Element) MSMUtils.getNodeFromNamed(default_lockfile.getDocumentElement(), "Machine");
+        machine_element.appendChild(default_lockfile.createTextNode(machine_name));
+        machine_element = null;
+        machine_name = null;
+        String date_time = Utility.getDateString();
+        Element date_element = (Element) MSMUtils.getNodeFromNamed(default_lockfile.getDocumentElement(), "Date");
+        date_element.appendChild(default_lockfile.createTextNode(date_time));
+        date_element = null;
+        date_time = null;
+        Utility.export(default_lockfile, destination);
+    }
+    catch (Exception error) {
+        Gatherer.printStackTrace(error);
+    }
+    }
+    /** Method that is called whenever an element within a set is changed or modified. We want to mark the collection so that it needs saving again.
       * @param event A <strong>MSMEvent</strong> containing details of the event that caused this message to be fired.
       * @see org.greenstone.gatherer.collection.Collection
       */
      public void elementChanged(MSMEvent event) {
           // This means the state of the collections has changed, so we should set saved to false.
           collection.setSaved(false);
+     }
      /** Used to retrieve the build options associated with the currently loaded collection. If none yet exist, default ones are created.
+    public void elementChanged(MSMEvent event) {
+    // This means the state of the collections has changed, so we should set saved to false.
+    collection.setSaved(false);
+    }
+    /** Used to retrieve the build options associated with the currently loaded collection. If none yet exist, default ones are created.
       * @return A <strong>BuildOptions</strong> object containing the build options for the current collection.
       * @see org.greenstone.gatherer.collection.Collection
       */
      public BuildOptions getBuildOptions() {
           return collection.build_options;
+     }
      /** Retrieve the current collection.
+    public BuildOptions getBuildOptions() {
+    return collection.build_options;
+    }
+    /** Retrieve the current collection.
       * @return The <strong>Collection</strong> itself.
       */
      public Collection getCollection() {
           return collection;
+     }
      /** Constructs the absolute filename of the collection archive directory, which should resemble "$GSDLHOME/collect/&lt;col_name&gt;/archive/"
+    public Collection getCollection() {
+    return collection;
+    }
+    /** Constructs the absolute filename of the collection archive directory, which should resemble "$GSDLHOME/collect/&lt;col_name&gt;/archive/"
       * @return A <strong>String</strong> containing the filename.
       * @see org.greenstone.gatherer.Configuration
 …
       * @see org.greenstone.gatherer.util.Utility
       */
      public String getCollectionArchive() {
           return Utility.getArchiveDir(Gatherer.config.gsdl_path, collection.getName());
+     }
      /** Constructs the absolute filename of the collection building directory, which should resemble "$GSDLHOME/collect/&lt;col_name&gt;/building/"
+    public String getCollectionArchive() {
+    return Utility.getArchiveDir(Gatherer.config.gsdl_path, collection.getName());
+    }
+    /** Constructs the absolute filename of the collection building directory, which should resemble "$GSDLHOME/collect/&lt;col_name&gt;/building/"
       * @return A <strong>String</strong> containing the filename.
       * @see org.greenstone.gatherer.Configuration
 …
       * @see org.greenstone.gatherer.util.Utility
       */
      public String getCollectionBuild() {
           return Utility.getBuildDir(Utility.getCollectionDir(Gatherer.config.gsdl_path) + collection.getName() + File.separator);
+     }
      /** Constructs the absolute filename of the collection cache directory, which should resemble "$GSDLHOME/collect/&lt;col_name&gt;/gcache/"
+    public String getCollectionBuild() {
+    return Utility.getBuildDir(Utility.getCollectionDir(Gatherer.config.gsdl_path) + collection.getName() + File.separator);
+    }
+    /** Constructs the absolute filename of the collection cache directory, which should resemble "$GSDLHOME/collect/&lt;col_name&gt;/gcache/"
       * @return A <strong>String</strong> containing the filename.
       * @see org.greenstone.gatherer.Configuration
 …
       * @see org.greenstone.gatherer.util.Utility
       */
      public String getCollectionCache() {
           return Utility.getCacheDir(Utility.getCollectionDir(Gatherer.config.gsdl_path) + collection.getName() + File.separator);
+     }
      /** Constructs the absolute filename of the collection config file, which should resemble "$GSDLHOME/collect/&lt;col_name&gt;/etc/collect.cfg"
+    public String getCollectionCache() {
+    return Utility.getCacheDir(Utility.getCollectionDir(Gatherer.config.gsdl_path) + collection.getName() + File.separator);
+    }
+    /** Constructs the absolute filename of the collection config file, which should resemble "$GSDLHOME/collect/&lt;col_name&gt;/etc/collect.cfg"
       * @return A <strong>String</strong> containing the filename.
       * @see org.greenstone.gatherer.Configuration
 …
       * @see org.greenstone.gatherer.util.Utility
       */
      public String getCollectionConfig() {
           return Utility.getConfigDir(Utility.getCollectionDir(Gatherer.config.gsdl_path) + collection.getName() + File.separator);
+     }
      /** Constructs the absolute filename of the collection directory, which should resemble "$GSDLHOME/collect/&lt;col_name&gt;"
+    public String getCollectionConfig() {
+    return Utility.getConfigDir(Utility.getCollectionDir(Gatherer.config.gsdl_path) + collection.getName() + File.separator);
+    }
+    /** Constructs the absolute filename of the collection directory, which should resemble "$GSDLHOME/collect/&lt;col_name&gt;"
       * @return A <strong>String</strong> containing the directory name.
       * @see org.greenstone.gatherer.Configuration
 …
       * @see org.greenstone.gatherer.util.Utility
       */
      public String getCollectionDirectory() {
           return Utility.getCollectionDir(Gatherer.config.gsdl_path) + collection.getName() + File.separator;
+     }
      /** Constructs the absolute filename of the collection etc directory, which should resemble "$GSDLHOME/collect/&lt;col_name&gt;/etc/"
+    public String getCollectionDirectory() {
+    return Utility.getCollectionDir(Gatherer.config.gsdl_path) + collection.getName() + File.separator;
+    }
+    /** Constructs the absolute filename of the collection etc directory, which should resemble "$GSDLHOME/collect/&lt;col_name&gt;/etc/"
       * @return A <strong>String</strong> containing the filename.
       * @see org.greenstone.gatherer.Configuration
 …
       * @see org.greenstone.gatherer.util.Utility
       */
      public String getCollectionEtc() {
           return Utility.getEtcDir(Utility.getCollectionDir(Gatherer.config.gsdl_path) + collection.getName() + File.separator);
+     }
      /** Constructs the absolute filename of the collection file, which should resemble "$GSDLHOME/collect/&lt;col_name&gt;/&lt;col_name&gt;.col"
+    public String getCollectionEtc() {
+    return Utility.getEtcDir(Utility.getCollectionDir(Gatherer.config.gsdl_path) + collection.getName() + File.separator);
+    }
+    /** Constructs the absolute filename of the collection file, which should resemble "$GSDLHOME/collect/&lt;col_name&gt;/&lt;col_name&gt;.col"
       * @return A <strong>String</strong> containing the filename.
       * @see org.greenstone.gatherer.Configuration
 …
       * @see org.greenstone.gatherer.util.Utility
       */
      public String getCollectionFilename() {
           return Utility.getCollectionDir(Gatherer.config.gsdl_path) + collection.getName() + File.separator + collection.getName() + ".col";
+     }
      /** Constructs the absolute filename of the collection import directory, which should resemble "$GSDLHOME/collect/&lt;col_name&gt;/gimport/"
+    public String getCollectionFilename() {
+    return Utility.getCollectionDir(Gatherer.config.gsdl_path) + collection.getName() + File.separator + collection.getName() + ".col";
+    }
+    /** Constructs the absolute filename of the collection import directory, which should resemble "$GSDLHOME/collect/&lt;col_name&gt;/gimport/"
       * @return A <strong>String</strong> containing the filename.
       * @see org.greenstone.gatherer.Configuration
 …
       * @see org.greenstone.gatherer.util.Utility
       */
      public String getCollectionImport() {
           return Utility.getImportDir(Utility.getCollectionDir(Gatherer.config.gsdl_path) + collection.getName() + File.separator);
+     }
      /** Constructs the absolute filename of the collection index directory, which should resemble "$GSDLHOME/collect/&lt;col_name&gt;/index/"
+    public String getCollectionImport() {
+    return Utility.getImportDir(Utility.getCollectionDir(Gatherer.config.gsdl_path) + collection.getName() + File.separator);
+    }
+    /** Constructs the absolute filename of the collection index directory, which should resemble "$GSDLHOME/collect/&lt;col_name&gt;/index/"
       * @return A <strong>String</strong> containing the filename.
       * @see org.greenstone.gatherer.Configuration
 …
       * @see org.greenstone.gatherer.util.Utility
       */
      public String getCollectionIndex() {
           return Utility.getIndexDir(Utility.getCollectionDir(Gatherer.config.gsdl_path) + collection.getName() + File.separator);
+     }
      /** Constructs the absolute filename of the collection log directory, which should resemble "$GSDLHOME/collect/&lt;col_name&gt;/log/"
+    public String getCollectionIndex() {
+    return Utility.getIndexDir(Utility.getCollectionDir(Gatherer.config.gsdl_path) + collection.getName() + File.separator);
+    }
+    /** Constructs the absolute filename of the collection log directory, which should resemble "$GSDLHOME/collect/&lt;col_name&gt;/log/"
       * @return A <strong>String</strong> containing the filename.
       * @see org.greenstone.gatherer.Configuration
 …
       * @see org.greenstone.gatherer.util.Utility
       */
      public String getCollectionLog() {
          return Utility.getLogDir(Utility.getCollectionDir(Gatherer.config.gsdl_path) + collection.getName() + File.separator);
+     }
      /** Constructs the absolute filename of the collection metadata directory, which should resemble "$GSDLHOME/collect/&lt;col_name&gt;/metadata/"
+    public String getCollectionLog() {
+    return Utility.getLogDir(Utility.getCollectionDir(Gatherer.config.gsdl_path) + collection.getName() + File.separator);
+    }
+    /** Constructs the absolute filename of the collection metadata directory, which should resemble "$GSDLHOME/collect/&lt;col_name&gt;/metadata/"
       * @return A <strong>String</strong> containing the filename.
       * @see org.greenstone.gatherer.Configuration
 …
       * @see org.greenstone.gatherer.util.Utility
       */
      public String getCollectionMetadata() {
           return Utility.getMetadataDir(Utility.getCollectionDir(Gatherer.config.gsdl_path) + collection.getName() + File.separator);
+     }
      public String getCollectionOldImport() {
           return Utility.getCollectionDir(Gatherer.config.gsdl_path) + collection.getName() + File.separator + Utility.OLD_IMPORT_DIR;
+     }
      /** This method either returns the title of the current collection, or a placeholder string of 'No Collection'.
+    public String getCollectionMetadata() {
+    return Utility.getMetadataDir(Utility.getCollectionDir(Gatherer.config.gsdl_path) + collection.getName() + File.separator);
+    }
+    public String getCollectionOldImport() {
+    return Utility.getCollectionDir(Gatherer.config.gsdl_path) + collection.getName() + File.separator + Utility.OLD_IMPORT_DIR;
+    }
+    /** This method either returns the title of the current collection, or a placeholder string of 'No Collection'.
       * @return A <strong>String</strong> which represents what we wish to display for a collection title.
       * @see org.greenstone.gatherer.collection.Collection
       */
      public String getCollectionTitle() {
           if(collection != null) {
                 return collection.getTitle();
+          }
           return get("Collection.No_Collection");
+     }
      /** Retrieve the record set (tree model) associated with the current collection. */
      public TreeModel getRecordSet() {
           if(collection_model == null && collection != null) {
+    public String getCollectionTitle() {
+    if(collection != null) {
+        return collection.getTitle();
+    }
+    return get("Collection.No_Collection");
+    }
+    /** Retrieve the record set (tree model) associated with the current collection. */
+    public TreeModel getRecordSet() {
+    if(collection_model == null && collection != null) {
                 // Check if the gimport directory exists, and if so use it.
                 File gimport_directory = new File(getCollectionImport());
                 if(gimport_directory.exists()) {
                      // Generate a new FileSystemModel based on the collection gimport directory.
                      collection_model = new FileSystemModel(new FileNode(gimport_directory, false));
+                }
                 else {
                      ///ystem.err.println("No gimport directory exists.");
                      // Otherwise default to the import directory. If it doesn't exist, there aint much more I can do.
                      // Generate a new FileSystemModel based on the collection import directory.
                      collection_model = new FileSystemModel(new FileNode(new File(getCollectionOldImport()), false));
+                }
+        File gimport_directory = new File(getCollectionImport());
+        if(gimport_directory.exists()) {
+        // Generate a new FileSystemModel based on the collection gimport directory.
+        collection_model = new FileSystemModel(new FileNode(gimport_directory, false));
+        }
+        else {
+        ///ystem.err.println("No gimport directory exists.");
+        // Otherwise default to the import directory. If it doesn't exist, there aint much more I can do.
+        // Generate a new FileSystemModel based on the collection import directory.
+        collection_model = new FileSystemModel(new FileNode(new File(getCollectionOldImport()), false));
+        }
                 // Ensure that the manager is a change listener for the tree.
                 if(fm_tree_model_listener == null) {
                      fm_tree_model_listener = new FMTreeModelListener();
+                }
                 collection_model.addTreeModelListener(fm_tree_model_listener);
+          }
           return collection_model;
+     }
      /** Create and return the model behind the workspace tree. Quite an extensive method, as it must first map known greenstone collections, then the local file system and finally any public or private download workspaces. */
      public TreeModel getWorkspace() {
           if(workspace_model != null) {
                 return workspace_model;
+          }
           // Create the workspace tree.
           FileNode workspace_root = new FileNode("ABS_ROOT");
           workspace_model = new FileSystemModel(workspace_root);
           // Create and add Greenstone collections node.
           // Starting at the collection directory of gsdl...
           File start = new File(Utility.getCollectionDir(Gatherer.config.gsdl_path));
           FileNode world_root = new FileNode(get("Tree.World"));
           workspace_root.insert(world_root);
           // For each of the children directories, which are collections...
           File cols[] = start.listFiles();
           ArrayTools.sort(cols);
           // We add their import and gimport directories, but only if its not our current collection.
           for(int i = 0; cols != null && i < cols.length; i++) {
                 if(collection == null || !(Utility.getCollectionDir(Gatherer.config.gsdl_path) + collection.getName()).equals(cols[i].getAbsolutePath())) {
                      File dirs[] = cols[i].listFiles();
                      ArrayTools.sort(dirs);
                      File import_dir = new File(cols[i], "gimport");
                      if(!import_dir.exists()) {
                           import_dir = new File(cols[i], "import");
+                     }
                      if(import_dir.exists()) {
                           FileNode collection_root = new FileNode(import_dir, cols[i].getName(), true);
                           world_root.insert(collection_root);
                           collection_root = null;
+                     }
                      import_dir = null;
+                }
+          }
           // Create Local File space.
           // Get all the available roots mounted on the system.
           File roots[] = File.listRoots();
           // If there is just one root use it as the tree root (linux)
           if(roots != null) {
                 FileNode file_root;
                 String name = get("Tree.Root");
                 if(roots.length == 1) {
                      file_root = new FileNode(roots[0], name);
                      workspace_root.insert(file_root);
+                }
+        if(fm_tree_model_listener == null) {
+        fm_tree_model_listener = new FMTreeModelListener();
+        }
+        collection_model.addTreeModelListener(fm_tree_model_listener);
+    }
+    return collection_model;
+    }
+    /** Create and return the model behind the workspace tree. Quite an extensive method, as it must first map known greenstone collections, then the local file system and finally any public or private download workspaces. */
+    public TreeModel getWorkspace() {
+    if(workspace_model != null) {
+        return workspace_model;
+    }
+    // Create the workspace tree.
+    FileNode workspace_root = new FileNode("ABS_ROOT");
+    workspace_model = new FileSystemModel(workspace_root);
+    // Create and add Greenstone collections node.
+    // Starting at the collection directory of gsdl...
+    File start = new File(Utility.getCollectionDir(Gatherer.config.gsdl_path));
+    FileNode world_root = new FileNode(get("Tree.World"));
+    workspace_root.insert(world_root);
+    // For each of the children directories, which are collections...
+    File cols[] = start.listFiles();
+    ArrayTools.sort(cols);
+    // We add their import and gimport directories, but only if its not our current collection.
+    for(int i = 0; cols != null && i < cols.length; i++) {
+        if(collection == null || !(Utility.getCollectionDir(Gatherer.config.gsdl_path) + collection.getName()).equals(cols[i].getAbsolutePath())) {
+        File dirs[] = cols[i].listFiles();
+        ArrayTools.sort(dirs);
+        File import_dir = new File(cols[i], "gimport");
+        if(!import_dir.exists()) {
+            import_dir = new File(cols[i], "import");
+        }
+        if(import_dir.exists()) {
+            FileNode collection_root = new FileNode(import_dir, cols[i].getName(), true);
+            world_root.insert(collection_root);
+            collection_root = null;
+        }
+        import_dir = null;
+        }
+    }
+    // Create Local File space.
+    // Get all the available roots mounted on the system.
+    File roots[] = File.listRoots();
+    // If there is just one root use it as the tree root (linux)
+    if(roots != null) {
+        FileNode file_root;
+        String name = get("Tree.Root");
+        if(roots.length == 1) {
+        file_root = new FileNode(roots[0], name);
+        workspace_root.insert(file_root);
+        }
                 // Otherwise build a dummy node which has these nodes as
                 // children.
                 else {
                      file_root = new FileNode(name);
                      workspace_root.insert(file_root);
                      // Hopefully this does an alphabetic sort.
                      ArrayTools.sort(roots);
                      for(int i = 0; i < roots.length; i++) {
                           FileNode child_root = new FileNode(roots[i]);
                           file_root.insert(child_root);
                           child_root = null;
+                     }
+                }
                 name = null;
                 file_root = null;
+          }
           // If mirroring is enabled show the public and private caches.
           if(Gatherer.config.get("workflow.mirror", false)) {
+        else {
+        file_root = new FileNode(name);
+        workspace_root.insert(file_root);
+        // Hopefully this does an alphabetic sort.
+        ArrayTools.sort(roots);
+        for(int i = 0; i < roots.length; i++) {
+            FileNode child_root = new FileNode(roots[i]);
+            file_root.insert(child_root);
+            child_root = null;
+        }
+        }
+        name = null;
+        file_root = null;
+    }
+    // If mirroring is enabled show the public and private caches.
+    if(Gatherer.config.get("workflow.mirror", false)) {
                 // Add Public workspace
                 FileNode public_root = new FileNode(new File(Utility.CACHE_DIR), get("Tree.Public"));
                 workspace_root.insert(public_root);
+        FileNode public_root = new FileNode(new File(Utility.CACHE_DIR), get("Tree.Public"));
+        workspace_root.insert(public_root);
                 // Add Private workspace if a collection has been loaded.
                 if(ready()) {
                      FileNode private_root = new FileNode(new File(getCollectionCache()), get("Tree.Private"));
                      workspace_root.insert(private_root);
+                }
+          }
           // Finally we retrieve and map any predefined special directories.
           if(ready()) {
                 HashMap mappings = collection.getDirectoryMappings();
                 for(Iterator names = mappings.keySet().iterator(); names.hasNext(); ) {
                      String name = (String) names.next();
                      File file = (File) mappings.get(name);
                      FileNode special_root = new FileNode(file, name);
                      //workspace_root.insert(special_root);
                      SynchronizedTreeModelTools.insertNodeInto(workspace_model, workspace_root, special_root);
+                }
+          }
           return workspace_model;
+     }
      /** This method when called, creates a new GShell in order to run the import.pl script.
+        if(ready()) {
+        FileNode private_root = new FileNode(new File(getCollectionCache()), get("Tree.Private"));
+        workspace_root.insert(private_root);
+        }
+    }
+    // Finally we retrieve and map any predefined special directories.
+    if(ready()) {
+        HashMap mappings = collection.getDirectoryMappings();
+        for(Iterator names = mappings.keySet().iterator(); names.hasNext(); ) {
+        String name = (String) names.next();
+        File file = (File) mappings.get(name);
+        FileNode special_root = new FileNode(file, name);
+        //workspace_root.insert(special_root);
+        SynchronizedTreeModelTools.insertNodeInto(workspace_model, workspace_root, special_root);
+        }
+    }
+    return workspace_model;
+    }
+    /** This method when called, creates a new GShell in order to run the import.pl script.
       * @see org.greenstone.gatherer.Configuration
       * @see org.greenstone.gatherer.Gatherer
 …
       * @see org.greenstone.gatherer.util.Utility
       */
      public void importCollection() {
           if(!saved()) {
+    public void importCollection() {
+    if(!saved()) {
                 // Force save.
                 try {
                      SaveCollectionTask save_task = new SaveCollectionTask(collection);
                      save_task.setImportAfter(true);
                      save_task.start();
+                }
                 catch(Exception error) {
                      Gatherer.printStackTrace(error);
+                }
+          }
           else {
                 importing = true;
                 String args[];
                 if(Utility.isWindows()) {
                      args = new String[6];
                      args[0] = Gatherer.config.perl_path;
                      args[1] = "-S";
                      args[2] = Gatherer.config.getScriptPath() + "import.pl";
                      args[3] = "-importdir";
                      args[4] = getCollectionImport();
                      args[5] = collection.getName();
+                }
                 else {
                      args = new String[4];
                      args[0] = Gatherer.config.getScriptPath() + "import.pl";
                      args[1] = "-importdir";
                      args[2] = getCollectionImport();
                      args[3] = collection.getName();
+                }
                 args = ArrayTools.add(args, collection.build_options.getImportValues());
                 GShell shell = new GShell(args, GShell.IMPORT, Message.BUILDING, this, import_monitor, GShell.GSHELL_IMPORT);
                 shell.addGShellListener(Gatherer.g_man.create_pane);
                 shell.start();
+          }
+     }
      /** Attempts to load the given collection. Currently uses simple serialization of the collection class.
+        try {
+        SaveCollectionTask save_task = new SaveCollectionTask(collection);
+        save_task.setImportAfter(true);
+        save_task.start();
+        }
+        catch(Exception error) {
+        Gatherer.printStackTrace(error);
+        }
+    }
+    else {
+        importing = true;
+        String args[];
+        if(Utility.isWindows()) {
+        args = new String[6];
+        args[0] = Gatherer.config.perl_path;
+        args[1] = "-S";
+        args[2] = Gatherer.config.getScriptPath() + "import.pl";
+        args[3] = "-importdir";
+        args[4] = getCollectionImport();
+        args[5] = collection.getName();
+        }
+        else {
+        args = new String[4];
+        args[0] = Gatherer.config.getScriptPath() + "import.pl";
+        args[1] = "-importdir";
+        args[2] = getCollectionImport();
+        args[3] = collection.getName();
+        }
+        args = ArrayTools.add(args, collection.build_options.getImportValues());
+        GShell shell = new GShell(args, GShell.IMPORT, Message.BUILDING, this, import_monitor, GShell.GSHELL_IMPORT);
+        shell.addGShellListener(Gatherer.g_man.create_pane);
+        shell.start();
+    }
+    }
+    /** Attempts to load the given collection. Currently uses simple serialization of the collection class.
       * @param location The path to the collection as a <strong>String</strong>.
       * @see org.greenstone.gatherer.Configuration
 …
       * @see org.greenstone.gatherer.util.Utility
       */
      public boolean loadCollection(String location) {
           ///ystem.err.println("Load Collection '" + location + "'");
           String[] args2 = new String[1];
           args2[0] = location;
           boolean result = false;
           // Check we have actually been given a .col file.
           if(location.endsWith(".col")) {
                 File collection_file = new File(location);
+    public boolean loadCollection(String location) {
+    ///ystem.err.println("Load Collection '" + location + "'");
+    String[] args2 = new String[1];
+    args2[0] = location;
+    boolean result = false;
+    // Check we have actually been given a .col file.
+    if(location.endsWith(".col")) {
+        File collection_file = new File(location);
                 // Ensure that the directory exists.
                 File collection_directory = collection_file.getParentFile();
                 if(collection_directory.exists()) {
                      String name = collection_directory.getName();
                      File lock_file = new File(collection_file.getParentFile(), LOCK_FILE);
                      // Now determine if a lock already exists on this collection.
                      int choice = LockFileDialog.YES_OPTION;
                      if(lock_file.exists()) {
                           LockFileDialog dialog = new LockFileDialog(Gatherer.g_man, name, lock_file);
                           choice = dialog.getChoice();
+                     }
                      if(choice == LockFileDialog.YES_OPTION) {
                           try {
                                 if(lock_file.exists()) {
                                      lock_file.delete();
+                                }
                                 // Create a lock file.
                                 createLockFile(lock_file);
                                 // Open the collection file
                                 collection = new Collection(collection_file);
                                 collection.msm = new MetadataSetManager();
                                 msm = collection.msm; // Legacy
                                 collection.msm.load();
                                 collection.cdm = new CollectionDesignManager();
                                 collection.gdm = new GDMManager();
                                 // Tell everyone that it worked.
                                 Gatherer.println(get("Loading_Successful", name));
                                 // Now we need to hook up classes that depend on messages from the metadata set manager to keep their content fresh.
                                 collection.msm.addMSMListener(this);
                                 // We're done. Let everyone know.
                                 if(Gatherer.g_man != null) {
                                      workspace_model = null;
                                      Gatherer.g_man.collectionChanged(ready());
+                                }
                                 result = true;
                           } catch (Exception error) {
                                 // There is obviously no existing collection present.
                                 Gatherer.printStackTrace(error);
                                 JOptionPane.showMessageDialog(Gatherer.g_man, get("Cannot_Open", args2), get("General.Error"), JOptionPane.ERROR_MESSAGE);
+                          }
+                     }
                      lock_file = null;
+                }
                 else {
                      JOptionPane.showMessageDialog(Gatherer.g_man, get("CollectionManager.File_Not_Found", args2), get("General.Error"), JOptionPane.ERROR_MESSAGE);
+                }
                 collection_directory = null;
+          }
           else {
                 JOptionPane.showMessageDialog(Gatherer.g_man, get("Not_Col_File", args2), get("General.Error"), JOptionPane.ERROR_MESSAGE);
                 Gatherer.println("Not a Gatherer Collection.");
+          }
           args2 = null;
           return result;
+     }
      public void makeCollection(String description, String email, String name, String title) {
           // Run the mkcol command.
           String command[];
           if(Utility.isWindows()) {
                 if(description == null || email == null || title == null) {
                      command = new String[4];
+                }
                 else {
                      command = new String[10];
+                }
                 command[0] = Gatherer.config.perl_path;
                 command[1] = "-S";
                 command[2] = Gatherer.config.getScriptPath() + "mkcol.pl";
                 if(description == null || email == null || title == null) {
                      command[3] = name;
+                }
                 else {
                      command[3] = "-title";
                      command[4] = title;
                      command[5] = "-creator";
                      command[6] = email;
                      command[7] = "-about";
                      command[8] = description;
                      command[9] = name;
+                }
+          }
           else {
                 if(description == null || email == null || title == null) {
                      command = new String[2];
                      command[0] = "mkcol.pl";
                      command[1] = name;
+                }
                 else {
                      command = new String[8];
                      command[0] = "mkcol.pl";
                      command[1] = "-title";
                      command[2] = title;
                      command[3] = "-creator";
                      command[4] = email;
                      command[5] = "-about";
                      command[6] = description;
                      command[7] = name;
+                }
+          }
           GShell process = new GShell(command, GShell.NEW, Message.COLLECT, this, null, GShell.GSHELL_NEW);
           process.addGShellListener(this);
           process.run(); // Don't bother threading this... yet
+     }
      /** Any implementation of GShellListener must include this method to allow the GShell to send messages to listeners. However in this case the CollectionManager is in no way interested in what the messages are, just the import events which have a specific type and are handled elsewhere. Thus we can safely ignore this event.
+        File collection_directory = collection_file.getParentFile();
+        if(collection_directory.exists()) {
+        String name = collection_directory.getName();
+        File lock_file = new File(collection_file.getParentFile(), LOCK_FILE);
+        // Now determine if a lock already exists on this collection.
+        int choice = LockFileDialog.YES_OPTION;
+        if(lock_file.exists()) {
+            LockFileDialog dialog = new LockFileDialog(Gatherer.g_man, name, lock_file);
+            choice = dialog.getChoice();
+        }
+        if(choice == LockFileDialog.YES_OPTION) {
+            try {
+            if(lock_file.exists()) {
+                lock_file.delete();
+            }
+            // Create a lock file.
+            createLockFile(lock_file);
+            // Open the collection file
+            collection = new Collection(collection_file);
+            collection.msm = new MetadataSetManager();
+            msm = collection.msm; // Legacy
+            collection.msm.load();
+            collection.cdm = new CollectionDesignManager();
+            collection.gdm = new GDMManager();
+            // Tell everyone that it worked.
+            Gatherer.println(get("Loading_Successful", name));
+            // Now we need to hook up classes that depend on messages from the metadata set manager to keep their content fresh.
+            collection.msm.addMSMListener(this);
+            // We're done. Let everyone know.
+            if(Gatherer.g_man != null) {
+                workspace_model = null;
+                Gatherer.g_man.collectionChanged(ready());
+            }
+            result = true;
+            } catch (Exception error) {
+            // There is obviously no existing collection present.
+            Gatherer.printStackTrace(error);
+            JOptionPane.showMessageDialog(Gatherer.g_man, get("Cannot_Open", args2), get("General.Error"), JOptionPane.ERROR_MESSAGE);
+            }
+        }
+        lock_file = null;
+        }
+        else {
+        JOptionPane.showMessageDialog(Gatherer.g_man, get("CollectionManager.File_Not_Found", args2), get("General.Error"), JOptionPane.ERROR_MESSAGE);
+        }
+        collection_directory = null;
+    }
+    else {
+        JOptionPane.showMessageDialog(Gatherer.g_man, get("Not_Col_File", args2), get("General.Error"), JOptionPane.ERROR_MESSAGE);
+        Gatherer.println("Not a Gatherer Collection.");
+    }
+    args2 = null;
+    return result;
+    }
+    public void makeCollection(String description, String email, String name, String title) {
+    // Run the mkcol command.
+    String command[];
+    if(Utility.isWindows()) {
+        if(description == null || email == null || title == null) {
+        command = new String[4];
+        }
+        else {
+        command = new String[10];
+        }
+        command[0] = Gatherer.config.perl_path;
+        command[1] = "-S";
+        command[2] = Gatherer.config.getScriptPath() + "mkcol.pl";
+        if(description == null || email == null || title == null) {
+        command[3] = name;
+        }
+        else {
+        command[3] = "-title";
+        command[4] = title;
+        command[5] = "-creator";
+        command[6] = email;
+        command[7] = "-about";
+        command[8] = description;
+        command[9] = name;
+        }
+    }
+    else {
+        if(description == null || email == null || title == null) {
+        command = new String[2];
+        command[0] = "mkcol.pl";
+        command[1] = name;
+        }
+        else {
+        command = new String[8];
+        command[0] = "mkcol.pl";
+        command[1] = "-title";
+        command[2] = title;
+        command[3] = "-creator";
+        command[4] = email;
+        command[5] = "-about";
+        command[6] = description;
+        command[7] = name;
+        }
+    }
+    GShell process = new GShell(command, GShell.NEW, Message.COLLECT, this, null, GShell.GSHELL_NEW);
+    process.addGShellListener(this);
+    process.run(); // Don't bother threading this... yet
+    }
+    /** Any implementation of GShellListener must include this method to allow the GShell to send messages to listeners. However in this case the CollectionManager is in no way interested in what the messages are, just the import events which have a specific type and are handled elsewhere. Thus we can safely ignore this event.
       * @param event A <strong>GShellEvent</strong> which contains a the message.
       */
      public synchronized void message(GShellEvent event) {
+     }
      /** Called whenever the metadata value changes in some way, such as the addition of a new value. We want to mark the collection so that it needs saving again.
+    public synchronized void message(GShellEvent event) {
+    }
+    /** Called whenever the metadata value changes in some way, such as the addition of a new value. We want to mark the collection so that it needs saving again.
       * @param event A <strong>MSMEvent</strong> containing details of the event that caused this message to be fired.
       * @see org.greenstone.gatherer.collection.Collection
       */
      public void metadataChanged(MSMEvent event) {
           // Again this change means we need to save the collection again.
           collection.setSaved(false);
+     }
      /** This call is fired whenever a process within a GShell created by this class begins.
+    public void metadataChanged(MSMEvent event) {
+    // Again this change means we need to save the collection again.
+    collection.setSaved(false);
+    }
+    /** This call is fired whenever a process within a GShell created by this class begins.
       * @param event A <strong>GShellEvent</strong> containing information about the GShell process.
       * @see org.greenstone.gatherer.Gatherer
 …
       * @see org.greenstone.gatherer.shell.GShell
       */
      public synchronized void processBegun(GShellEvent event) {
           ///ystem.err.println("ProcessBegun " + event.getType());
           // If this is one of the types where we wish to lock user control
           Gatherer.g_man.lockCollection((event.getType() == GShell.IMPORT), true);
+     }
      /** This call is fired whenever a process within a GShell created by this class ends.
+    public synchronized void processBegun(GShellEvent event) {
+    ///ystem.err.println("ProcessBegun " + event.getType());
+    // If this is one of the types where we wish to lock user control
+    Gatherer.g_man.lockCollection((event.getType() == GShell.IMPORT), true);
+    }
+    /** This call is fired whenever a process within a GShell created by this class ends.
       * @param event A <strong>GShellEvent</strong> containing information about the GShell process.
       * @see org.greenstone.gatherer.Gatherer
 …
       * @see org.greenstone.gatherer.shell.GShell
       */
      public synchronized void processComplete(GShellEvent event) {
           ///ystem.err.println("ProcessComplete " + event.getType());
           Gatherer.g_man.lockCollection((event.getType() == GShell.IMPORT), false);
           ///ystem.err.println("Recieved process complete event - " + event);
           // If we were running an import, now run a build.
           if(event.getType() == GShell.IMPORT && event.getStatus() != GShell.ERROR) {
+    public synchronized void processComplete(GShellEvent event) {
+    ///ystem.err.println("ProcessComplete " + event.getType());
+    Gatherer.g_man.lockCollection((event.getType() == GShell.IMPORT), false);
+    ///ystem.err.println("Recieved process complete event - " + event);
+    // If we were running an import, now run a build.
+    if(event.getType() == GShell.IMPORT && event.getStatus() != GShell.ERROR) {
                 // Finish import.
                 collection.setImported(true);
                 buildCollection();
+          }
           // If we were running a build, now is when we move files across.
           else if(event.getType() == GShell.BUILD && event.getStatus() != GShell.ERROR) {
+        collection.setImported(true);
+        buildCollection();
+    }
+    // If we were running a build, now is when we move files across.
+    else if(event.getType() == GShell.BUILD && event.getStatus() != GShell.ERROR) {
                 ///ystem.err.println("Installing collection.");
                 installCollection();
                 collection.setBuilt(true);
+        installCollection();
+        collection.setBuilt(true);
                 // If we have a local library running (that we know about) then we ask it to add our newly create collection
                 ///ystem.err.println("Check if we should reset local server.");
                 if(Gatherer.config.exec_file != null) {
                      ///ystem.err.println("Local Library Found!");
                     Gatherer.g_man.preview_pane.configServer(GSDLSiteConfig.ADD_COMMAND + collection.getName());
+                }
+        if(Gatherer.config.exec_file != null) {
+        ///ystem.err.println("Local Library Found!");
+        Gatherer.g_man.preview_pane.configServer(GSDLSiteConfig.ADD_COMMAND + collection.getName());
+        }
                 //else {
                 ///ystem.err.println("GLI can't recognize a local library.");
                 //}
                 // Signal collection changed.
                 workspace_model = null;
                 Gatherer.g_man.collectionChanged(ready());
                 JOptionPane.showMessageDialog(Gatherer.g_man, get("Preview_Ready"), get("Preview_Ready_Title"), JOptionPane.INFORMATION_MESSAGE);
+          }
           else if(event.getType() == GShell.BUILD && event.getStatus() == GShell.ERROR) {
                 JOptionPane.showMessageDialog(Gatherer.g_man, get("Preview_Ready_Failed"), get("Preview_Ready_Title"), JOptionPane.ERROR_MESSAGE);
+          }
+     }
      /** Determine if the manager is ready for actions apon its collection.
+        workspace_model = null;
+        Gatherer.g_man.collectionChanged(ready());
+        JOptionPane.showMessageDialog(Gatherer.g_man, get("Preview_Ready"), get("Preview_Ready_Title"), JOptionPane.INFORMATION_MESSAGE);
+    }
+    else if(event.getType() == GShell.BUILD && event.getStatus() == GShell.ERROR) {
+        JOptionPane.showMessageDialog(Gatherer.g_man, get("Preview_Ready_Failed"), get("Preview_Ready_Title"), JOptionPane.ERROR_MESSAGE);
+    }
+    }
+    /** Determine if the manager is ready for actions apon its collection.
       * @return A <i>boolean</i> which is <i>true</i> to indicate a collection has been loaded and thus the collection is ready for editing, <i>false</i> otherwise.
       */
      public boolean ready() {
           if(collection != null) {
                 return true;
+          }
           return false;
+     }
      /** Called to refresh the models upon which the trees are based.
       * @see org.greenstone.gatherer.collection.Collection
       */
      public void refreshTrees() {
+     }
      /** This method associates the collection build monitor with the build monitor created in CreatePane.
+    public boolean ready() {
+    if(collection != null) {
+        return true;
+    }
+    return false;
+    }
+    /** Called to refresh the models upon which the trees are based.
+      * @see org.greenstone.gatherer.collection.Collection
+      */
+    public void refreshTrees() {
+    }
+    /** This method associates the collection build monitor with the build monitor created in CreatePane.
       * @param monitor A <strong>GShellProgressMonitor</strong> which we will use as the build monitor.
       */
      public void registerBuildMonitor(GShellProgressMonitor monitor) {
           build_monitor = monitor;
+     }
      /** This method associates the collection copy monitor with the copy monitor created in CreatePane.
+    public void registerBuildMonitor(GShellProgressMonitor monitor) {
+    build_monitor = monitor;
+    }
+    /** This method associates the collection copy monitor with the copy monitor created in CreatePane.
       * @param monitor A <strong>GShellProgressMonitor</strong> which we will use as the copy monitor.
       */
      public void registerCopyMonitor(GShellProgressMonitor monitor) {
           copy_monitor = monitor;
+     }
      /** This method associates the collection import monitor with the import monitor created in CreatePane.
+    public void registerCopyMonitor(GShellProgressMonitor monitor) {
+    copy_monitor = monitor;
+    }
+    /** This method associates the collection import monitor with the import monitor created in CreatePane.
       * @param monitor A <strong>GShellProgressMonitor</strong> which we will use as the import monitor.
       */
      public void registerImportMonitor(GShellProgressMonitor monitor) {
           import_monitor = monitor;
+     }
      /** Remove a previously assigned special directory mapping.
+    public void registerImportMonitor(GShellProgressMonitor monitor) {
+    import_monitor = monitor;
+    }
+    /** Remove a previously assigned special directory mapping.
       * @param name The symbolic name of the special directory mapping to remove as a <strong>String</strong>.
       * @return The <strong>File</strong> of the mapping removed.
       */
      public File removeDirectoryMapping(FileNode target) {
           File file = null;
           if(ready()) {
+    public File removeDirectoryMapping(FileNode target) {
+    File file = null;
+    if(ready()) {
                 // Remove from collection, remembering file
                 file = collection.removeDirectoryMapping(target.toString());
+        file = collection.removeDirectoryMapping(target.toString());
                 // Update tree.
                 FileSystemModel model = (FileSystemModel) Gatherer.g_man.collection_pane.getWorkspaceTree().getModel();
                 SynchronizedTreeModelTools.removeNodeFromParent(model, target);
+          }
           return file;
+     }
      /** Used to check whether all open collections have a 'saved' state.
+        FileSystemModel model = (FileSystemModel) Gatherer.g_man.collection_pane.getWorkspaceTree().getModel();
+        SynchronizedTreeModelTools.removeNodeFromParent(model, target);
+    }
+    return file;
+    }
+    /** Used to check whether all open collections have a 'saved' state.
       * @return A <i>boolean</i> which is <i>true</i> if the collection has been saved.
       * @see org.greenstone.gatherer.collection.Collection
       */
      public boolean saved() {
           boolean result = true;
           if(collection != null) {
                 result = collection.getSaved();
+          }
           return result;
+     }
      /** Saves a collection by serializing it to file.
+    public boolean saved() {
+    boolean result = true;
+    if(collection != null) {
+        result = collection.getSaved();
+    }
+    return result;
+    }
+    /** Saves a collection by serializing it to file.
       * @param close_after <i>true</i> to cause the Gatherer to close the collection once save is complete, <i>false</i> otherwise.
       * @param exit_after <i>true</i> to cause the Gatherer to exit once save is complete, <i>false</i> otherwise.
 …
       * @see org.greenstone.gatherer.collection.Collection
       */
      public void saveCollection(boolean close_after, boolean exit_after) {
           try {
                 SaveCollectionTask save_task = new SaveCollectionTask(collection, close_after, exit_after);
                 save_task.start();
+          }
           catch(Exception error) {
                 Gatherer.printStackTrace(error);
+          }
+     }
      /** Saves the current collection to a new filename, then restores the original collection. Finally opens the collection copy.
+    public void saveCollection(boolean close_after, boolean exit_after) {
+    try {
+        SaveCollectionTask save_task = new SaveCollectionTask(collection, close_after, exit_after);
+        save_task.start();
+    }
+    catch(Exception error) {
+        Gatherer.printStackTrace(error);
+    }
+    }
+    /** Saves the current collection to a new filename, then restores the original collection. Finally opens the collection copy.
       * @param name The name collection name.
       */
      public void saveCollectionAs(String name) {
           // We need to do this in a separate thread so create a SaveCollectionAsTask
           try {
                 SaveCollectionTask save_task = new SaveCollectionTask(collection, name);
                 save_task.start();
+          }
           catch(Exception error) {
                 Gatherer.printStackTrace(error);
+          }
+     }
      /** Method that is called whenever the metadata set collection changes in some way, such as the addition of a new set or the merging of two sets. We want to mark the collection so that it needs saving again.
+    public void saveCollectionAs(String name) {
+    // We need to do this in a separate thread so create a SaveCollectionAsTask
+    try {
+        SaveCollectionTask save_task = new SaveCollectionTask(collection, name);
+        save_task.start();
+    }
+    catch(Exception error) {
+        Gatherer.printStackTrace(error);
+    }
+    }
+    /** Method that is called whenever the metadata set collection changes in some way, such as the addition of a new set or the merging of two sets. We want to mark the collection so that it needs saving again.
       * @param event A <strong>MSMEvent</strong> containing details of the event that caused this message to be fired.
       * @see org.greenstone.gatherer.collection.Collection
       */
      public void setChanged(MSMEvent event) {
           // Invalidate saved
           collection.setSaved(false);
+     }
      /** Updates the given workspace tree model to reference the private cache of the currently loaded collection. */
      public void updatePrivateWorkspace(DefaultTreeModel model) {
           // Add Private workspace if a collection has been loaded.
           if(ready() && !Gatherer.config.get("workflow.mirror", true)) {
                 FileNode root = (FileNode)model.getRoot();
+    public void setChanged(MSMEvent event) {
+    // Invalidate saved
+    collection.setSaved(false);
+    }
+    /** Updates the given workspace tree model to reference the private cache of the currently loaded collection. */
+    public void updatePrivateWorkspace(DefaultTreeModel model) {
+    // Add Private workspace if a collection has been loaded.
+    if(ready() && !Gatherer.config.get("workflow.mirror", true)) {
+        FileNode root = (FileNode)model.getRoot();
                 // Remove old private workspace
                 FileNode old = (FileNode)model.getChild(root, 2);
                 model.removeNodeFromParent(old);
+        FileNode old = (FileNode)model.getChild(root, 2);
+        model.removeNodeFromParent(old);
                 // Create and insert new.
                 FileNode private_workspace = new FileNode(new File(getCollectionCache()), get("Tree.Private"));
                 model.insertNodeInto(private_workspace, root, 2);
+          }
+     }
      /** Called whenever the value tree of an metadata element changes in some way, such as the addition of a new value. We want to mark the collection so that it needs saving again.
+        FileNode private_workspace = new FileNode(new File(getCollectionCache()), get("Tree.Private"));
+        model.insertNodeInto(private_workspace, root, 2);
+    }
+    }
+    /** Called whenever the value tree of an metadata element changes in some way, such as the addition of a new value. We want to mark the collection so that it needs saving again.
       * @param event A <strong>MSMEvent</strong> containing details of the event that caused this message to be fired.
       * @see org.greenstone.gatherer.collection.Collection
       */
      public void valueChanged(MSMEvent event) {
           collection.setSaved(false);
+     }
      /** Used to retrive a value from the dictionary based on the key.
+    public void valueChanged(MSMEvent event) {
+    collection.setSaved(false);
+    }
+    /** Used to retrive a value from the dictionary based on the key.
       * @param key A <strong>String</strong> indicating what value to retrieve.
       * @return A <strong>String</strong> representing the value.
       */
      private String get(String key) {
           return get(key, (String[])null);
+     }
      /** Used to retrive a value from the dictionary based on the key. */
      private String get(String key, String arg) {
           String[] args = new String[1];
           args[0] = arg;
           return get(key, args);
+     }
      /** Used to retrive a value from the dictionary based on the key, and an array of arguments.
+    private String get(String key) {
+    return get(key, (String[])null);
+    }
+    /** Used to retrive a value from the dictionary based on the key. */
+    private String get(String key, String arg) {
+    String[] args = new String[1];
+    args[0] = arg;
+    return get(key, args);
+    }
+    /** Used to retrive a value from the dictionary based on the key, and an array of arguments.
       * @param key A <strong>String</strong> indicating what value to retrieve.
       * @param args A <strong>String[]</strong> of arguments to be inserted into the phrase.
       * @return A <strong>String</strong> representing the value.
       */
      private String get(String key, String args[]) {
           if(key.indexOf('.') == -1) {
                 key = "CollectionManager." + key;
+          }
           return Gatherer.dictionary.get(key, args);
+     }
      /** Install collection by moving its files from building to index after a successful build.
       * @see org.greenstone.gatherer.Gatherer
       * @see org.greenstone.gatherer.util.Utility
       */
      private void installCollection() {
           Gatherer.println("Build complete. Moving files.");
+    private String get(String key, String args[]) {
+    if(key.indexOf('.') == -1) {
+        key = "CollectionManager." + key;
+    }
+    return Gatherer.dictionary.get(key, args);
+    }
+    /** Install collection by moving its files from building to index after a successful build.
+      * @see org.greenstone.gatherer.Gatherer
+      * @see org.greenstone.gatherer.util.Utility
+      */
+    private void installCollection() {
+    Gatherer.println("Build complete. Moving files.");
           try {
+    try {
                 // We have to ensure that the local library
                 if(Gatherer.config.exec_file != null) {
                      ///ystem.err.println("Local Library Found!");
                     Gatherer.g_man.preview_pane.configServer(GSDLSiteConfig.RELEASE_COMMAND + collection.getName());
+                }
+        if(Gatherer.config.exec_file != null) {
+        ///ystem.err.println("Local Library Found!");
+        Gatherer.g_man.preview_pane.configServer(GSDLSiteConfig.RELEASE_COMMAND + collection.getName());
+        }
                 File index_dir = new File(getCollectionIndex(), "temp.txt");
                 index_dir = index_dir.getParentFile();
                 Gatherer.println("Index = " + index_dir.getAbsolutePath());
+        File index_dir = new File(getCollectionIndex(), "temp.txt");
+        index_dir = index_dir.getParentFile();
+        Gatherer.println("Index = " + index_dir.getAbsolutePath());
                 if(index_dir.exists()) {
                      Utility.delete(index_dir);
+                }
                 if(index_dir.exists()) {
                      throw(new Exception("Index directory cannot be removed."));
+                }
+        if(index_dir.exists()) {
+        Utility.delete(index_dir);
+        }
+        if(index_dir.exists()) {
+        throw(new Exception("Index directory cannot be removed."));
+        }
                 File build_dir = new File(getCollectionBuild(), "temp.txt");
                 build_dir = build_dir.getParentFile();
                 Gatherer.println("Build = " + build_dir.getAbsolutePath());
                 build_dir.renameTo(index_dir);
                 File new_build = new File(getCollectionBuild(), "temp.txt");
                 new_build = new_build.getParentFile();
                 if(new_build.exists()) {
                      throw(new Exception("Build directory cannot be moved."));
+                }
                 new_build.mkdir();
+          }
           catch (Exception exception) {
                 JOptionPane.showMessageDialog(Gatherer.g_man, "Exception detected during collection install.\nMost likely caused by Windows or Local Library holding locks on files:\n" + exception.getMessage(), "Error", JOptionPane.ERROR_MESSAGE);
+          }
+     }
      /** Creates and dispatches a message given the initial details.
+        File build_dir = new File(getCollectionBuild(), "temp.txt");
+        build_dir = build_dir.getParentFile();
+        Gatherer.println("Build = " + build_dir.getAbsolutePath());
+        build_dir.renameTo(index_dir);
+        File new_build = new File(getCollectionBuild(), "temp.txt");
+        new_build = new_build.getParentFile();
+        if(new_build.exists()) {
+        throw(new Exception("Build directory cannot be moved."));
+        }
+        new_build.mkdir();
+    }
+    catch (Exception exception) {
+        JOptionPane.showMessageDialog(Gatherer.g_man, "Exception detected during collection install.\nMost likely caused by Windows or Local Library holding locks on files:\n" + exception.getMessage(), "Error", JOptionPane.ERROR_MESSAGE);
+    }
+    }
+    /** Creates and dispatches a message given the initial details.
       * @param level An <i>int</i> indicating the message level for this message.
       * @param message A <strong>String</strong> which contains the payload of this message.
 …
       * @see org.greenstone.gatherer.Message
       */
+     private void message(int level, String message) {
+          Message msg = new Message(Message.COLLECT, level, message);
+          if(Gatherer.g_man != null) {
+                Gatherer.log.add(msg);
+          } else {
+                Gatherer.println(msg.toString());
+          }
+     }
+     private boolean searchArchivesForMetadata(File archive_directory) {
+          /** @todo - ensure GreenstoneArchiveParser works as expected. */
+          return true;
+     }
+     private boolean searchForMetadata(File current_file) {
+          boolean cancelled = false;
+          if(current_file.isFile() && current_file.getName().equals(Utility.METADATA_XML)) {
+                cancelled = collection.msm.searchForMetadata(null, new FileNode(current_file), false, true); // A dummy run only.
+          }
+          else {
+                File[] children_files = current_file.listFiles();
+                for(int i = 0; !cancelled && children_files != null && i < children_files.length; i++) {
+                     cancelled = searchForMetadata(children_files[i]);
+    private void message(int level, String message) {
+    Message msg = new Message(Message.COLLECT, level, message);
+    if(Gatherer.g_man != null) {
+        Gatherer.log.add(msg);
+    } else {
+        Gatherer.println(msg.toString());
+    }
+    }
+    private boolean searchArchivesForMetadata(File archive_directory) {
+    /** @todo - ensure GreenstoneArchiveParser works as expected. */
+    return true;
+    }
+    private boolean searchForMetadata(File current_file) {
+    boolean cancelled = false;
+    if(current_file.isFile() && current_file.getName().equals(Utility.METADATA_XML)) {
+        cancelled = collection.msm.searchForMetadata(null, new FileNode(current_file), false, true); // A dummy run only.
+    }
+    else {
+        File[] children_files = current_file.listFiles();
+        for(int i = 0; !cancelled && children_files != null && i < children_files.length; i++) {
+        cancelled = searchForMetadata(children_files[i]);
+        }
+    }
+    return cancelled;
+    }
+    private void updateCollectionCFG(File base_cfg, File new_cfg, String description, String email, String title) {
+    boolean first_name = true;
+    boolean first_extra = true;
+    String collection_path = (base_cfg.getParentFile().getParentFile()).getAbsolutePath();
+    HashMap mappings = collection.msm.profiler.getActions(collection_path);
+    // Now read in base_cfg line by line, parsing important onces and/or replacing them with information pertinent to our collection. Each line is then written back out to the new collect.cfg file.
+    try {
+        BufferedReader in = new BufferedReader(new FileReader(base_cfg));
+        BufferedWriter out = new BufferedWriter(new FileWriter(new_cfg, false)); // Overwrite whats there.
+        String command = null;
+        while((command = in.readLine()) != null) {
+        // We have to test the end of command for the special character '\'. If found, remove it and append the next line, then repeat.
+        while(command.trim().endsWith("\\")) {
+            command = command.substring(0, command.lastIndexOf("\\"));
+            String next_line = in.readLine();
+            if(next_line != null) {
+            command = command + next_line;
+            }
+        }
+        ///ystem.err.println("Read: " + command);
+        // Now we've finished parsing a line, determine what to do with it.
+        String command_lc = command.toLowerCase();
+        // We replace the creator string with our own.
+        if(command_lc.startsWith(Utility.CFG_CREATOR)) {
+            write(out, Utility.CFG_CREATOR + " " + email);
+        }
+        else if(command_lc.startsWith(Utility.CFG_MAINTAINER)) {
+            write(out, Utility.CFG_MAINTAINER + " " + email);
+        }
+        else if(command_lc.startsWith(Utility.CFG_COLLECTIONMETA_COLLECTIONNAME)) {
+            if(first_name) {
+            write(out, Utility.CFG_COLLECTIONMETA_COLLECTIONNAME + " \"" + title + "\"");
+            first_name = false;
+            }
+        }
+        else if(command_lc.startsWith(Utility.CFG_COLLECTIONMETA_COLLECTIONEXTRA)) {
+            if(first_extra) {
+            write(out, Utility.CFG_COLLECTIONMETA_COLLECTIONEXTRA + " \"" + description + "\"");
+            first_extra = false;
+            }
+        }
+        else if(command_lc.startsWith(Utility.CFG_COLLECTIONMETA_ICONCOLLECTION)) {
+            write(out, Utility.CFG_COLLECTIONMETA_ICONCOLLECTION + " \"\"");
+        }
+        // Just before we try more general parsing there are the special cases to check. These are explicit changes required by some collections to produce sensible results.
+        else if(special_case == SPECIAL_DLS && command_lc.equals("classify      hierarchy -hfile azlist.txt -metadata azlist -sort title -buttonname title -hlist_at_top")) {
+            write(out, "classify AZList -metadata dls.Title -buttonname Title");
+        }
+        else if(command_lc.startsWith(Utility.CFG_CLASSIFY)) {
+            StringTokenizer tokenizer = new StringTokenizer(command);
+            StringBuffer text = new StringBuffer(tokenizer.nextToken());
+            // Read in the classifier command watching for hfile, metadata and sort arguments.
+            String buttonname = null;
+            String hfile = null;
+            String new_metadata = null;
+            String old_metadata = null;
+            while(tokenizer.hasMoreTokens()) {
+            String token = tokenizer.nextToken();
+            if(token.equals(Utility.CFG_CLASSIFY_HFILE)) {
+                if(tokenizer.hasMoreTokens()) {
+                text.append(" ");
+                text.append(token);
+                token = tokenizer.nextToken();
+                hfile = token;
+                }
+            }
+            else if(token.equals(Utility.CFG_CLASSIFY_METADATA)) {
+                if(tokenizer.hasMoreTokens()) {
+                text.append(" ");
+                text.append(token);
+                String temp_metadata = tokenizer.nextToken();
+                String replacement = (String) mappings.get(temp_metadata);
+                if(replacement != null) {
+                    token = replacement;
+                    old_metadata = temp_metadata;
+                    new_metadata = replacement;
+                }
+          }
+          return cancelled;
+     }
+     private void updateCollectionCFG(File base_cfg, File new_cfg, String description, String email, String title) {
+          boolean first_name = true;
+          boolean first_extra = true;
+          String collection_path = (base_cfg.getParentFile().getParentFile()).getAbsolutePath();
+          HashMap mappings = collection.msm.profiler.getActions(collection_path);
+          // Now read in base_cfg line by line, parsing important onces and/or replacing them with information pertinent to our collection. Each line is then written back out to the new collect.cfg file.
+          try {
+                BufferedReader in = new BufferedReader(new FileReader(base_cfg));
+                BufferedWriter out = new BufferedWriter(new FileWriter(new_cfg, false)); // Overwrite whats there.
+                String command = null;
+                while((command = in.readLine()) != null) {
+                     // We have to test the end of command for the special character '\'. If found, remove it and append the next line, then repeat.
+                     while(command.trim().endsWith("\\")) {
+                          command = command.substring(0, command.lastIndexOf("\\"));
+                          String next_line = in.readLine();
+                          if(next_line != null) {
+                                command = command + next_line;
+                          }
+                     }
+                     ///ystem.err.println("Read: " + command);
+                     // Now we've finished parsing a line, determine what to do with it.
+                     String command_lc = command.toLowerCase();
+                     // We replace the creator string with our own.
+                     if(command_lc.startsWith(Utility.CFG_CREATOR)) {
+                          write(out, Utility.CFG_CREATOR + " " + email);
+                     }
+                     else if(command_lc.startsWith(Utility.CFG_MAINTAINER)) {
+                          write(out, Utility.CFG_MAINTAINER + " " + email);
+                     }
+                     else if(command_lc.startsWith(Utility.CFG_COLLECTIONMETA_COLLECTIONNAME)) {
+                          if(first_name) {
+                                write(out, Utility.CFG_COLLECTIONMETA_COLLECTIONNAME + " \"" + title + "\"");
+                                first_name = false;
+                          }
+                     }
+                     else if(command_lc.startsWith(Utility.CFG_COLLECTIONMETA_COLLECTIONEXTRA)) {
+                          if(first_extra) {
+                                write(out, Utility.CFG_COLLECTIONMETA_COLLECTIONEXTRA + " \"" + description + "\"");
+                                first_extra = false;
+                          }
+                     }
+                     else if(command_lc.startsWith(Utility.CFG_COLLECTIONMETA_ICONCOLLECTION)) {
+                          write(out, Utility.CFG_COLLECTIONMETA_ICONCOLLECTION + " \"\"");
+                     }
+                     // Just before we try more general parsing there are the special cases to check. These are explicit changes required by some collections to produce sensible results.
+                     else if(special_case == SPECIAL_DLS && command_lc.equals("classify      hierarchy -hfile azlist.txt -metadata azlist -sort title -buttonname title -hlist_at_top")) {
+                          write(out, "classify AZList -metadata dls.Title -buttonname Title");
+                     }
+                     else if(command_lc.startsWith(Utility.CFG_CLASSIFY)) {
+                          StringTokenizer tokenizer = new StringTokenizer(command);
+                          StringBuffer text = new StringBuffer(tokenizer.nextToken());
+                          // Read in the classifier command watching for hfile, metadata and sort arguments.
+                          String buttonname = null;
+                          String hfile = null;
+                          String new_metadata = null;
+                          String old_metadata = null;
+                          while(tokenizer.hasMoreTokens()) {
+                                String token = tokenizer.nextToken();
+                                if(token.equals(Utility.CFG_CLASSIFY_HFILE)) {
+                                     if(tokenizer.hasMoreTokens()) {
+                                          text.append(" ");
+                                          text.append(token);
+                                          token = tokenizer.nextToken();
+                                          hfile = token;
+                                     }
+                                }
+                                else if(token.equals(Utility.CFG_CLASSIFY_METADATA)) {
+                                     if(tokenizer.hasMoreTokens()) {
+                                          text.append(" ");
+                                          text.append(token);
+                                          String temp_metadata = tokenizer.nextToken();
+                                          String replacement = (String) mappings.get(temp_metadata);
+                                          if(replacement != null) {
+                                                token = replacement;
+                                                old_metadata = temp_metadata;
+                                                new_metadata = replacement;
+                                          }
+                                          else {
+                                                token = temp_metadata;
+                                          }
+                                          temp_metadata = null;
+                                          replacement = null;
+                                     }
+                                }
+                                else if(token.equals(Utility.CFG_CLASSIFY_SORT)) {
+                                     if(tokenizer.hasMoreTokens()) {
+                                          text.append(" ");
+                                          text.append(token);
+                                          String temp_metadata = tokenizer.nextToken();
+                                          String replacement = (String) mappings.get(temp_metadata);
+                                          if(replacement != null) {
+                                                token = replacement;
+                                          }
+                                          else {
+                                                token = temp_metadata;
+                                          }
+                                          temp_metadata = null;
+                                          replacement = null;
+                                     }
+                                }
+                                else if(token.equals(Utility.CFG_CLASSIFY_BUTTONNAME)) {
+                                    buttonname = token;
+                                }
+                                text.append(' ');
+                                text.append(token);
+                                token = null;
+                          }
+                          tokenizer = null;
+                          // If we replaced the metadata argument and didn't encounter a buttonname, then add one now pointing back to the old metadata name in order to accomodate macro files which required such names (buttonname is metadata name by default)!
+                          if(old_metadata != null && new_metadata != null && buttonname == null) {
+                            text.append(' ');
+                            text.append(Utility.CFG_CLASSIFY_BUTTONNAME);
+                            text.append(' ');
+                            text.append(old_metadata);
+                          }
+                          command = text.toString();
+                          // Replace the hfile if we found it
+                          if(hfile != null && new_metadata != null) {
+                                command = command.replaceAll(hfile, new_metadata + ".txt");
+                          }
+                          buttonname = null;
+                          hfile = null;
+                          new_metadata = null;
+                          old_metadata = null;
+                          write(out, command);
+                     }
+                     else {
+                          // There is still one special case, that of the format command. In such a command we have to search for [<target>] to ensure we don't change parts of the format which have nothing to do with the metadata elements.
+                          boolean format_command = command_lc.startsWith(Utility.CFG_FORMAT);
+                          // Replace mapping strings
+                          if(mappings != null) {
+                                for(Iterator keys = mappings.keySet().iterator(); keys.hasNext(); ) {
+                                     String target = (String) keys.next();
+                                     String replacement = (String) mappings.get(target);
+                                     if(format_command) {
+                                          target = "\\[" + target + "\\]";
+                                          replacement = "{Or}{[" + replacement + "]," + target + "}";
+                                     }
+                                     command = command.replaceAll(target, replacement);
+                                }
+                          }
+                          write(out, command);
+                     }
+                else {
+                    token = temp_metadata;
+                }
+                in.close();
+                in = null;
+                out.flush();
+                out.close();
+                out = null;
+          }
+          catch(Exception error) {
+                Gatherer.printStackTrace(error);
+          }
+          // All done, I hope.
+     }
+     private void write(BufferedWriter out, String message)
+          throws Exception {
+          ///ystem.err.println("Writing: " + message);
+          out.write(message, 0, message.length());
+          out.newLine();
+     }
+     /** The CollectionManager class is getting too confusing by half so I'll implement this TreeModelListener in a private class to make responsibility clear. */
+     private class FMTreeModelListener
+          implements TreeModelListener {
+          /** Any action that changes one of the tree models within a collection, which are the only models we listen to, mean the collections contents have changed and so saved should be set to false.
+                temp_metadata = null;
+                replacement = null;
+                }
+            }
+            else if(token.equals(Utility.CFG_CLASSIFY_SORT)) {
+                if(tokenizer.hasMoreTokens()) {
+                text.append(" ");
+                text.append(token);
+                String temp_metadata = tokenizer.nextToken();
+                String replacement = (String) mappings.get(temp_metadata);
+                if(replacement != null) {
+                    token = replacement;
+                }
+                else {
+                    token = temp_metadata;
+                }
+                temp_metadata = null;
+                replacement = null;
+                }
+            }
+            else if(token.equals(Utility.CFG_CLASSIFY_BUTTONNAME)) {
+                buttonname = token;
+            }
+            text.append(' ');
+            text.append(token);
+            token = null;
+            }
+            tokenizer = null;
+            // If we replaced the metadata argument and didn't encounter a buttonname, then add one now pointing back to the old metadata name in order to accomodate macro files which required such names (buttonname is metadata name by default)!
+            if(old_metadata != null && new_metadata != null && buttonname == null) {
+            text.append(' ');
+            text.append(Utility.CFG_CLASSIFY_BUTTONNAME);
+            text.append(' ');
+            text.append(old_metadata);
+            }
+            command = text.toString();
+            // Replace the hfile if we found it
+            if(hfile != null && new_metadata != null) {
+            command = command.replaceAll(hfile, new_metadata + ".txt");
+            }
+            buttonname = null;
+            hfile = null;
+            new_metadata = null;
+            old_metadata = null;
+            write(out, command);
+        }
+        else {
+            // There is still one special case, that of the format command. In such a command we have to search for [<target>] to ensure we don't change parts of the format which have nothing to do with the metadata elements.
+            boolean format_command = command_lc.startsWith(Utility.CFG_FORMAT);
+            // Replace mapping strings
+            if(mappings != null) {
+            for(Iterator keys = mappings.keySet().iterator(); keys.hasNext(); ) {
+                String target = (String) keys.next();
+                String replacement = (String) mappings.get(target);
+                if(format_command) {
+                target = "\\[" + target + "\\]";
+                replacement = "{Or}{[" + replacement + "]," + target + "}";
+                }
+                command = command.replaceAll(target, replacement);
+            }
+            }
+            write(out, command);
+        }
+        }
+        in.close();
+        in = null;
+        out.flush();
+        out.close();
+        out = null;
+    }
+    catch(Exception error) {
+        Gatherer.printStackTrace(error);
+    }
+    // All done, I hope.
+    }
+    private void write(BufferedWriter out, String message)
+    throws Exception {
+    ///ystem.err.println("Writing: " + message);
+    out.write(message, 0, message.length());
+    out.newLine();
+    }
+    /** The CollectionManager class is getting too confusing by half so I'll implement this TreeModelListener in a private class to make responsibility clear. */
+    private class FMTreeModelListener
+    implements TreeModelListener {
+    /** Any action that changes one of the tree models within a collection, which are the only models we listen to, mean the collections contents have changed and so saved should be set to false.
+     * @param event A <strong>TreeModelEvent</strong> encompassing all the information about the event which has changed the tree.
+            */
+    public void treeNodesChanged(TreeModelEvent event) {
+        if(collection != null) {
+        collection.setSaved(false);
+        }
+    }
+    /** Any action that changes one of the tree models within a collection, which are the only models we listen to, mean the collections contents have changed and so saved should be set to false.
             * @param event A <strong>TreeModelEvent</strong> encompassing all the information about the event which has changed the tree.
             */
           public void treeNodesChanged(TreeModelEvent event) {
                 if(collection != null) {
                      collection.setSaved(false);
+                }
+          }
           /** Any action that changes one of the tree models within a collection, which are the only models we listen to, mean the collections contents have changed and so saved should be set to false.
+    public void treeNodesInserted(TreeModelEvent event) {
+        if(collection != null) {
+        collection.setSaved(false);
+        }
+    }
+    /** Any action that changes one of the tree models within a collection, which are the only models we listen to, mean the collections contents have changed and so saved should be set to false.
             * @param event A <strong>TreeModelEvent</strong> encompassing all the information about the event which has changed the tree.
             */
           public void treeNodesInserted(TreeModelEvent event) {
                 if(collection != null) {
                      collection.setSaved(false);
+                }
+          }
           /** Any action that changes one of the tree models within a collection, which are the only models we listen to, mean the collections contents have changed and so saved should be set to false.
+    public void treeNodesRemoved(TreeModelEvent event) {
+        if(collection != null) {
+        collection.setSaved(false);
+        }
+    }
+    /** Any action that changes one of the tree models within a collection, which are the only models we listen to, mean the collections contents have changed and so saved should be set to false.
             * @param event A <strong>TreeModelEvent</strong> encompassing all the information about the event which has changed the tree.
             */
+          public void treeNodesRemoved(TreeModelEvent event) {
+                if(collection != null) {
+                     collection.setSaved(false);
+                }
+          }
+          /** Any action that changes one of the tree models within a collection, which are the only models we listen to, mean the collections contents have changed and so saved should be set to false.
+            * @param event A <strong>TreeModelEvent</strong> encompassing all the information about the event which has changed the tree.
+            */
+          public void treeStructureChanged(TreeModelEvent event) {
+                if(collection != null) {
+                     collection.setSaved(false);
+                }
+          }
+     }
+    public void treeStructureChanged(TreeModelEvent event) {
+        if(collection != null) {
+        collection.setSaved(false);
+        }
+    }
+    }
+}

trunk/gli/src/org/greenstone/gatherer/collection/DeleteCollectionPrompt.java

-              r4293
+              r4366
  */
 public class DeleteCollectionPrompt
      extends JDialog {
      /** The currently selected collection for deletion. */
      private Collection collection = null;
      /** The model behind the list. */
      private DefaultListModel list_model = null;
      /** A reference to ourself so any inner-classes get dispose of us. */
      private DeleteCollectionPrompt prompt = null;
      /** The close button, which exits the prompt without deleting anything. */
      private JButton close_button = null;
      /** The ok button which causes the selected collection to be deleted. */
      private JButton ok_button = null;
      /** The confirmation check box. */
      private JCheckBox confirmation = null;
      /** The label above details. */
      private JLabel details_label = null;
      /** The label above the list. */
      private JLabel list_label = null;
      /** The list of available collections. */
      private JList list = null;
      /** The text area used to display details about the collection selected. */
      private JTextArea details = null;
      /** A string array used to pass arguments to the phrase retrieval method. */
      private String args[] = null;
      /** The size of the delete prompt screen. */
      public static final Dimension SIZE = new Dimension(500, 500);
      /** Constructor.
       * @see org.greenstone.gatherer.collection.DeleteCollectionPrompt.CloseButtonListener
       * @see org.greenstone.gatherer.collection.DeleteCollectionPrompt.CollectionListListener
       * @see org.greenstone.gatherer.collection.DeleteCollectionPrompt.ConfirmationCheckBoxListener
       * @see org.greenstone.gatherer.collection.DeleteCollectionPrompt.OKButtonListener
       */
      public DeleteCollectionPrompt() {
           super();
           this.close_button = new JButton(get("General.Close", null));
           this.confirmation = new JCheckBox(get("Confirm_Delete", null));
           this.details = new JTextArea();
           this.details_label = new JLabel(get("Collection_Details", null));
           this.list = new JList();
           this.list_label = new JLabel(get("Collection_List", null));
           this.list_model = new DefaultListModel();
           this.ok_button = new JButton(get("General.OK", null));
           this.prompt = this;
           this.setModal(true);
           this.setSize(SIZE);
           this.setTitle(get("Title", null));
           close_button.addActionListener(new CloseButtonListener());
           confirmation.addActionListener(new ConfirmationCheckBoxListener());
           confirmation.setEnabled(false);
           confirmation.setSelected(false);
           details.setFont(Gatherer.config.getFont("general.tooltip_font", false));
           details.setText(get("No_Collection", null));
           list.addListSelectionListener(new CollectionListListener());
           list.clearSelection();
           list.getSelectionModel().setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
           list.setModel(list_model);
           ok_button.addActionListener(new OKButtonListener());
           ok_button.setEnabled(false);
           scanForCollections();
+     }
      /** Destructor. */
      public void destroy() {
           close_button = null;
           confirmation = null;
           details = null;
           details_label = null;
           list_model.clear();
           list_model = null;
           list = null;
           ok_button = null;
           prompt = null;
+     }
      /** This method causes the modal prompt to be displayed. */
      public void display() {
           // Central pane
           JPanel list_pane = new JPanel(new BorderLayout());
           list_pane.add(list_label, BorderLayout.NORTH);
           list_pane.add(new JScrollPane(list), BorderLayout.CENTER);
           list_pane.setBorder(BorderFactory.createEmptyBorder(0, 0, 5, 0));
           JPanel details_pane = new JPanel(new BorderLayout());
           details_pane.add(details_label, BorderLayout.NORTH);
           details_pane.add(new JScrollPane(details), BorderLayout.CENTER);
           details_pane.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 0));
           JPanel central_pane = new JPanel(new GridLayout(2, 1));
           central_pane.add(list_pane);
           central_pane.add(details_pane);
           central_pane.setBorder(BorderFactory.createEmptyBorder(5, 5, 5, 5));
           // Lower pane
           JPanel confirmation_pane = new JPanel(new BorderLayout());
           confirmation_pane.add(confirmation, BorderLayout.CENTER);
           confirmation_pane.setBorder(BorderFactory.createEmptyBorder(0,0,5,0));
           JPanel button_pane = new JPanel(new GridLayout(1, 2));
           button_pane.add(ok_button);
           button_pane.add(close_button);
           button_pane.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 0));
           JPanel lower_pane = new JPanel(new BorderLayout());
           lower_pane.add(confirmation_pane, BorderLayout.NORTH);
           lower_pane.add(button_pane, BorderLayout.SOUTH);
           lower_pane.setBorder(BorderFactory.createEmptyBorder(0, 5, 5, 5));
           // Final.
           JPanel content_pane = (JPanel)this.getContentPane();
           content_pane.setLayout(new BorderLayout());
           content_pane.add(central_pane, BorderLayout.CENTER);
           content_pane.add(lower_pane, BorderLayout.SOUTH);
           // Center and display.
           Dimension screen_size = Gatherer.config.screen_size;
           this.setLocation((screen_size.width - SIZE.width) / 2, (screen_size.height - SIZE.height) / 2);
           this.show();
+     }
      /** Shows a delete complete prompt.
+    extends JDialog {
+    /** The currently selected collection for deletion. */
+    private Collection collection = null;
+    /** The model behind the list. */
+    private DefaultListModel list_model = null;
+    /** A reference to ourself so any inner-classes get dispose of us. */
+    private DeleteCollectionPrompt prompt = null;
+    /** The close button, which exits the prompt without deleting anything. */
+    private JButton close_button = null;
+    /** The ok button which causes the selected collection to be deleted. */
+    private JButton ok_button = null;
+    /** The confirmation check box. */
+    private JCheckBox confirmation = null;
+    /** The label above details. */
+    private JLabel details_label = null;
+    /** The label above the list. */
+    private JLabel list_label = null;
+    /** The list of available collections. */
+    private JList list = null;
+    /** The text area used to display details about the collection selected. */
+    private JTextArea details = null;
+    /** A string array used to pass arguments to the phrase retrieval method. */
+    private String args[] = null;
+    /** The size of the delete prompt screen. */
+    public static final Dimension SIZE = new Dimension(500, 500);
+    /** Constructor.
+     * @see org.greenstone.gatherer.collection.DeleteCollectionPrompt.CloseButtonListener
+     * @see org.greenstone.gatherer.collection.DeleteCollectionPrompt.CollectionListListener
+     * @see org.greenstone.gatherer.collection.DeleteCollectionPrompt.ConfirmationCheckBoxListener
+     * @see org.greenstone.gatherer.collection.DeleteCollectionPrompt.OKButtonListener
+     */
+    public DeleteCollectionPrompt() {
+    super();
+    this.close_button = new JButton(get("General.Close", null));
+    this.confirmation = new JCheckBox(get("Confirm_Delete", null));
+    this.details = new JTextArea();
+    this.details_label = new JLabel(get("Collection_Details", null));
+    this.list = new JList();
+    this.list_label = new JLabel(get("Collection_List", null));
+    this.list_model = new DefaultListModel();
+    this.ok_button = new JButton(get("General.OK", null));
+    this.prompt = this;
+    this.setModal(true);
+    this.setSize(SIZE);
+    this.setTitle(get("Title", null));
+    close_button.addActionListener(new CloseButtonListener());
+    confirmation.addActionListener(new ConfirmationCheckBoxListener());
+    confirmation.setEnabled(false);
+    confirmation.setSelected(false);
+    details.setFont(Gatherer.config.getFont("general.tooltip_font", false));
+    details.setText(get("No_Collection", null));
+    list.addListSelectionListener(new CollectionListListener());
+    list.clearSelection();
+    list.getSelectionModel().setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
+    list.setModel(list_model);
+    ok_button.addActionListener(new OKButtonListener());
+    ok_button.setEnabled(false);
+    scanForCollections();
+    }
+    /** Destructor. */
+    public void destroy() {
+    close_button = null;
+    confirmation = null;
+    details = null;
+    details_label = null;
+    list_model.clear();
+    list_model = null;
+    list = null;
+    ok_button = null;
+    prompt = null;
+    }
+    /** This method causes the modal prompt to be displayed. */
+    public void display() {
+    // Central pane
+    JPanel list_pane = new JPanel(new BorderLayout());
+    list_pane.add(list_label, BorderLayout.NORTH);
+    list_pane.add(new JScrollPane(list), BorderLayout.CENTER);
+    list_pane.setBorder(BorderFactory.createEmptyBorder(0, 0, 5, 0));
+    JPanel details_pane = new JPanel(new BorderLayout());
+    details_pane.add(details_label, BorderLayout.NORTH);
+    details_pane.add(new JScrollPane(details), BorderLayout.CENTER);
+    details_pane.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 0));
+    JPanel central_pane = new JPanel(new GridLayout(2, 1));
+    central_pane.add(list_pane);
+    central_pane.add(details_pane);
+    central_pane.setBorder(BorderFactory.createEmptyBorder(5, 5, 5, 5));
+    // Lower pane
+    JPanel confirmation_pane = new JPanel(new BorderLayout());
+    confirmation_pane.add(confirmation, BorderLayout.CENTER);
+    confirmation_pane.setBorder(BorderFactory.createEmptyBorder(0,0,5,0));
+    JPanel button_pane = new JPanel(new GridLayout(1, 2));
+    button_pane.add(ok_button);
+    button_pane.add(close_button);
+    button_pane.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 0));
+    JPanel lower_pane = new JPanel(new BorderLayout());
+    lower_pane.add(confirmation_pane, BorderLayout.NORTH);
+    lower_pane.add(button_pane, BorderLayout.SOUTH);
+    lower_pane.setBorder(BorderFactory.createEmptyBorder(0, 5, 5, 5));
+    // Final.
+    JPanel content_pane = (JPanel)this.getContentPane();
+    content_pane.setLayout(new BorderLayout());
+    content_pane.add(central_pane, BorderLayout.CENTER);
+    content_pane.add(lower_pane, BorderLayout.SOUTH);
+    // Center and display.
+    Dimension screen_size = Gatherer.config.screen_size;
+    this.setLocation((screen_size.width - SIZE.width) / 2, (screen_size.height - SIZE.height) / 2);
+    this.show();
+    }
+    /** Shows a delete complete prompt.
       * @param success A <strong>boolean</strong> indicating if the collection was successfully deleted.
       * @see org.greenstone.gatherer.collection.Collection
       */
      public void resultPrompt(boolean success) {
           args = new String[1];
           args[0] = collection.getName();
           if(success) {
                 JOptionPane.showMessageDialog(prompt,get("Successful_Delete", args),get("Successful_Title", null),JOptionPane.INFORMATION_MESSAGE);
+          }
           else {
                 JOptionPane.showMessageDialog(prompt,get("Failed_Delete", args),get("Failed_Title", null),JOptionPane.WARNING_MESSAGE);
+          }
+     }
      /** Retrieves a phrase from the <strong>Dictionary</strong> in <strong>Gatherer</strong>.
+    public void resultPrompt(boolean success) {
+    args = new String[1];
+    args[0] = collection.getName();
+    if(success) {
+        JOptionPane.showMessageDialog(prompt,get("Successful_Delete", args),get("Successful_Title", null),JOptionPane.INFORMATION_MESSAGE);
+    }
+    else {
+        JOptionPane.showMessageDialog(prompt,get("Failed_Delete", args),get("Failed_Title", null),JOptionPane.WARNING_MESSAGE);
+    }
+    }
+    /** Retrieves a phrase from the <strong>Dictionary</strong> in <strong>Gatherer</strong>.
       * @param key A <strong>String</strong> used to match against a specific phrase in the dictionary.
       * @see org.greenstone.gatherer.Dictionary
       * @see org.greenstone.gatherer.Gatherer
       */
      private String get(String key, String args[]) {
           if(key.indexOf(".") == -1) {
                 key = "DeleteCollectionPrompt." + key;
+          }
           return Gatherer.dictionary.get(key, args);
+     }
      /** Attempts to load the given collection. Currently uses simple
+    private String get(String key, String args[]) {
+    if(key.indexOf(".") == -1) {
+        key = "DeleteCollectionPrompt." + key;
+    }
+    return Gatherer.dictionary.get(key, args);
+    }
+    /** Attempts to load the given collection. Currently uses simple
       * serialization of the collection class.
       * @param location The path to the serialized collection.
       */
      public Collection loadCollection(File file) {
           Collection col = null;
           try {
                 FileInputStream fis = new FileInputStream(file);
                 BufferedInputStream bin = new BufferedInputStream(fis);
                 ObjectInputStream input = new ObjectInputStream(bin);
                 col = (Collection) input.readObject();
                 input.close();
                 input = null;
                 bin.close();
                 bin = null;
                 fis.close();
                 fis = null;
+          }
           catch (Exception error) {
                 error.printStackTrace();
+          }
           return col;
+     }
      /** Method to scan the collect directory retrieving and reloading each collection it finds, while building the list of known collections.
+    public Collection loadCollection(File file) {
+    Collection col = null;
+    try {
+        FileInputStream fis = new FileInputStream(file);
+        BufferedInputStream bin = new BufferedInputStream(fis);
+        ObjectInputStream input = new ObjectInputStream(bin);
+        col = (Collection) input.readObject();
+        input.close();
+        input = null;
+        bin.close();
+        bin = null;
+        fis.close();
+        fis = null;
+    }
+    catch (Exception error) {
+        error.printStackTrace();
+    }
+    return col;
+    }
+    /** Method to scan the collect directory retrieving and reloading each collection it finds, while building the list of known collections.
       * @see org.greenstone.gatherer.Configuration
       * @see org.greenstone.gatherer.Gatherer
 …
       * @see org.greenstone.gatherer.util.Utility
       */
      private void scanForCollections() {
           // Start at the collect dir.
           String collect_directory_name = Utility.getCollectionDir(Gatherer.config.gsdl_path);
           File collect_directory = new File(collect_directory_name);
           if(collect_directory.exists()) {
+    private void scanForCollections() {
+    // Start at the collect dir.
+    String collect_directory_name = Utility.getCollectionDir(Gatherer.config.gsdl_path);
+    File collect_directory = new File(collect_directory_name);
+    if(collect_directory.exists()) {
                 // Now for each child directory see if it contains a .col file and
                 // if so try to load it..
                 File collections[] = collect_directory.listFiles();
                 ArrayTools.sort(collections);
                 for(int i = 0; collections != null && i < collections.length; i++) {
                      File children[] = collections[i].listFiles();
                      for(int j = 0; children != null && j < children.length; j++) {
                           if(children[j].getAbsolutePath().endsWith(".col")) {
                                 Collection col = loadCollection(children[j]);
                                 // If we've actually loaded
                                 if(col != null) {
                                      list_model.addElement(col);
+                                }
+                          }
+                     }
+                }
+          }
           // Otherwise the collect directory doesn't actually exist, so there ain't much we can do.
+     }
      /** A button listener implementation, which listens for actions on the close button and disposes of the dialog when detected. */
      private class CloseButtonListener
           implements ActionListener {
           /** Any implementation of ActionListener must include this method so we can be informed when the button is actioned.
             * @param event An <strong>ActionEvent</strong> containing all the relevant information garnered from the event itself.
+        File collections[] = collect_directory.listFiles();
+        ArrayTools.sort(collections);
+        for(int i = 0; collections != null && i < collections.length; i++) {
+        File children[] = collections[i].listFiles();
+        for(int j = 0; children != null && j < children.length; j++) {
+            if(children[j].getAbsolutePath().endsWith(".col")) {
+            Collection col = loadCollection(children[j]);
+            // If we've actually loaded
+            if(col != null) {
+                list_model.addElement(col);
+            }
+            }
+        }
+        }
+    }
+    // Otherwise the collect directory doesn't actually exist, so there ain't much we can do.
+    }
+    /** A button listener implementation, which listens for actions on the close button and disposes of the dialog when detected. */
+    private class CloseButtonListener
+    implements ActionListener {
+    /** Any implementation of ActionListener must include this method so we can be informed when the button is actioned.
+     * @param event An <strong>ActionEvent</strong> containing all the relevant information garnered from the event itself.
             */
           public void actionPerformed(ActionEvent event) {
                 prompt.dispose();
+          }
+     }
      /** This private class listens for selection events in from the list and then displays the appropriate details for that collection.
       */
      private class CollectionListListener
           implements ListSelectionListener {
           /** Any implementation of ListSelectionListener must include this method so we can be informed when the list selection changes.
             * @param event A <strong>ListSelectionEvent</strong> containing all the relevant information garnered from the event itself.
+    public void actionPerformed(ActionEvent event) {
+        prompt.dispose();
+    }
+    }
+    /** This private class listens for selection events in from the list and then displays the appropriate details for that collection.
+      */
+    private class CollectionListListener
+    implements ListSelectionListener {
+    /** Any implementation of ListSelectionListener must include this method so we can be informed when the list selection changes.
+     * @param event A <strong>ListSelectionEvent</strong> containing all the relevant information garnered from the event itself.
             */
           public void valueChanged(ListSelectionEvent event) {
                 if(!list.isSelectionEmpty()) {
                      confirmation.setEnabled(true);
                      collection = (Collection) list.getSelectedValue();
                      args = new String[4];
                      args[0] = collection.getTitle();
                      args[1] = collection.getName();
                      args[2] = collection.getEmail();
                      args[3] = collection.getDescription();
                      details.setText(get("Details", args));
+                }
                 else {
                      confirmation.setEnabled(false);
                      details.setText(get("No_Collection", null));
+                }
+          }
+     }
      /** A check box listener so we can tell if the users selected confirm. */
      private class ConfirmationCheckBoxListener
           implements ActionListener {
           /** Any implementation of ActionListener must include this method so we can be informed when the button is actioned.
             * @param event An <strong>ActionEvent</strong> containing all the relevant information garnered from the event itself.
+    public void valueChanged(ListSelectionEvent event) {
+        if(!list.isSelectionEmpty()) {
+        confirmation.setEnabled(true);
+        collection = (Collection) list.getSelectedValue();
+        args = new String[4];
+        args[0] = collection.getTitle();
+        args[1] = collection.getName();
+        args[2] = collection.getEmail();
+        args[3] = collection.getDescription();
+        details.setText(get("Details", args));
+        }
+        else {
+        confirmation.setEnabled(false);
+        details.setText(get("No_Collection", null));
+        }
+    }
+    }
+    /** A check box listener so we can tell if the users selected confirm. */
+    private class ConfirmationCheckBoxListener
+    implements ActionListener {
+    /** Any implementation of ActionListener must include this method so we can be informed when the button is actioned.
+     * @param event An <strong>ActionEvent</strong> containing all the relevant information garnered from the event itself.
             */
           public void actionPerformed(ActionEvent event) {
                 if(confirmation.isSelected()) {
                      ok_button.setEnabled(true);
+                }
                 else {
                      ok_button.setEnabled(false);
+                }
+          }
+     }
      /** The OK button listener implementation. */
      private class OKButtonListener
           implements ActionListener {
           /** Any implementation of ActionListener must include this method so we can be informed when the button is actioned.
             * @param event An <strong>ActionEvent</strong> containing all the relevant information garnered from the event itself.
             * @see org.greenstone.gatherer.Configuration
             * @see org.greenstone.gatherer.Gatherer
             * @see org.greenstone.gatherer.util.Utility
             */
           public void actionPerformed(ActionEvent event) {
+    public void actionPerformed(ActionEvent event) {
+        if(confirmation.isSelected()) {
+        ok_button.setEnabled(true);
+        }
+        else {
+        ok_button.setEnabled(false);
+        }
+    }
+    }
+    /** The OK button listener implementation. */
+    private class OKButtonListener
+    implements ActionListener {
+    /** Any implementation of ActionListener must include this method so we can be informed when the button is actioned.
+     * @param event An <strong>ActionEvent</strong> containing all the relevant information garnered from the event itself.
+     * @see org.greenstone.gatherer.Configuration
+     * @see org.greenstone.gatherer.Gatherer
+     * @see org.greenstone.gatherer.util.Utility
+     */
+    public void actionPerformed(ActionEvent event) {
                 // Delete the selected collection.
                 File delete_me = new File(Utility.getCollectionDir(Gatherer.config.gsdl_path) + collection.getName() + File.separator);
                 if(Utility.delete(delete_me)) {
                      resultPrompt(true);
                      list_model.removeElement(collection);
                      details.setText(get("No_Collection", null));
                      confirmation.setEnabled(false);
                      confirmation.setSelected(false);
                      ok_button.setEnabled(false);
                      collection = null;
+                }
                 else {
                      resultPrompt(false);
+                }
+          }
+     }
+        File delete_me = new File(Utility.getCollectionDir(Gatherer.config.gsdl_path) + collection.getName() + File.separator);
+        if(Utility.delete(delete_me)) {
+        resultPrompt(true);
+        list_model.removeElement(collection);
+        details.setText(get("No_Collection", null));
+        confirmation.setEnabled(false);
+        confirmation.setSelected(false);
+        ok_button.setEnabled(false);
+        collection = null;
+        }
+        else {
+        resultPrompt(false);
+        }
+    }
+    }
+}

trunk/gli/src/org/greenstone/gatherer/collection/Job.java

-              r4293
+              r4366
  */
 public class Job
      implements ActionListener {
+    implements ActionListener {
      private boolean clobber;
+    private boolean clobber;
     private boolean debug;
      private boolean higher_directories;
      private boolean no_parents;
      private boolean other_hosts;
      private boolean page_requisites;
      private boolean quiet;
      private GProgressBar progress;
      private GURL initial = null;
      private GURL url = null;
      private TreeModel model;
      private int depth;
      private int previous_state;
      private int state;
      private String current_url;
      private String destination;
      private String proxy_pass;
      private String proxy_user;
      private Vector encountered_urls;
      private Vector failed_urls;
      private WGet mummy;
      public static int COMPLETE = 0;
      public static int PAUSED   = 1;
+    private boolean higher_directories;
+    private boolean no_parents;
+    private boolean other_hosts;
+    private boolean page_requisites;
+    private boolean quiet;
+    private GProgressBar progress;
+    private GURL initial = null;
+    private GURL url = null;
+    private TreeModel model;
+    private int depth;
+    private int previous_state;
+    private int state;
+    private String current_url;
+    private String destination;
+    private String proxy_pass;
+    private String proxy_user;
+    private Vector encountered_urls;
+    private Vector failed_urls;
+    private WGet mummy;
+    public static int COMPLETE = 0;
+    public static int PAUSED   = 1;
     public static int RUNNING  = 2;
     public static int STOPPED  = 3;
      /**
       */
      public Job(TreeModel model, boolean clobber, boolean debug, boolean no_parents, boolean other_hosts, boolean page_requisites, boolean quiet, GURL initial, int depth, String destination, String proxy_pass, String proxy_user, WGet mummy, boolean simple) {
           this.model = model;
           this.debug = debug;
           this.clobber = clobber;
           this.no_parents = no_parents;
           this.other_hosts = other_hosts;
           this.page_requisites = page_requisites;
           this.quiet = quiet;
           this.initial = initial;
           this.depth = depth;
           this.destination = destination;
           this.proxy_pass = proxy_pass;
           this.proxy_user = proxy_user;
           this.mummy = mummy;
           progress = new GProgressBar(this, initial.toString(), simple);
           encountered_urls = new Vector();
           failed_urls = new Vector();
           previous_state = STOPPED;
           state = STOPPED;
+     }
      /** Depending on which button on the progress bar was pushed,
       * this method will affect the state of the Job and perhaps make
       * calls to wget.class if necessary.
       * @param event The ActionEvent fired from within the GProgressBar
       * which we must respond to.
       */
      public void actionPerformed(ActionEvent event) {
         // The action button is used to alternately start or stop the
         // job. If the current state of the job is paused then this
         // restart is logically equivelent to a resume.
           if(event.getSource() == progress.action) {
                 previous_state = state;
                 if(state == RUNNING) {
                      state = PAUSED;
+                }
                 else {
                      state = RUNNING;
                      mummy.resumeThread();
+                }
+          }
           else if (event.getSource() == progress.cancel) {
                 state = STOPPED; // Should already be stopped.
                 mummy.deleteJob(this);
+          }
+     }
      /** Called by the WGet native code to inform us of a new download starting.
       * @param url The url that is being downloaded, as a String.
       */
      public void addDownload(String raw_url) {
           if(!encountered_urls.contains(raw_url)) {
                 encountered_urls.add(raw_url);
+          }
           // Regardless create a new GURL
           current_url = raw_url;
           url = new GURL(raw_url);
           progress.addDownload(raw_url);
+     }
      /** Used to advise the Job of a newly parsed link. Its up to Job
       * to decide if it already knows about this url, and if not to
       * update its progress bar.
       * @param url The url in question as a String.
       * @param type Whether the link is an internal or external link.
       * @return A boolean indicating if the url was added.
       */
      public boolean addLink(String raw_url, int type) {
         ///ystem.out.println("addLink("+url+", "+type+")");
           if(!encountered_urls.contains(raw_url)) {
+    /**
+     */
+    public Job(TreeModel model, boolean clobber, boolean debug, boolean no_parents, boolean other_hosts, boolean page_requisites, boolean quiet, GURL initial, int depth, String destination, String proxy_pass, String proxy_user, WGet mummy, boolean simple) {
+    this.model = model;
+    this.debug = debug;
+    this.clobber = clobber;
+    this.no_parents = no_parents;
+    this.other_hosts = other_hosts;
+    this.page_requisites = page_requisites;
+    this.quiet = quiet;
+    this.initial = initial;
+    this.depth = depth;
+    this.destination = destination;
+    this.proxy_pass = proxy_pass;
+    this.proxy_user = proxy_user;
+    this.mummy = mummy;
+    progress = new GProgressBar(this, initial.toString(), simple);
+    encountered_urls = new Vector();
+    failed_urls = new Vector();
+    previous_state = STOPPED;
+    state = STOPPED;
+    }
+    /** Depending on which button on the progress bar was pushed,
+     * this method will affect the state of the Job and perhaps make
+     * calls to wget.class if necessary.
+     * @param event The ActionEvent fired from within the GProgressBar
+     * which we must respond to.
+     */
+    public void actionPerformed(ActionEvent event) {
+    // The action button is used to alternately start or stop the
+    // job. If the current state of the job is paused then this
+    // restart is logically equivelent to a resume.
+    if(event.getSource() == progress.action) {
+        previous_state = state;
+        if(state == RUNNING) {
+        state = PAUSED;
+        }
+        else {
+        state = RUNNING;
+        mummy.resumeThread();
+        }
+    }
+    else if (event.getSource() == progress.cancel) {
+        state = STOPPED; // Should already be stopped.
+        mummy.deleteJob(this);
+    }
+    }
+    /** Called by the WGet native code to inform us of a new download starting.
+     * @param url The url that is being downloaded, as a String.
+     */
+    public void addDownload(String raw_url) {
+    if(!encountered_urls.contains(raw_url)) {
+        encountered_urls.add(raw_url);
+    }
+    // Regardless create a new GURL
+    current_url = raw_url;
+    url = new GURL(raw_url);
+    progress.addDownload(raw_url);
+    }
+    /** Used to advise the Job of a newly parsed link. Its up to Job
+     * to decide if it already knows about this url, and if not to
+     * update its progress bar.
+     * @param url The url in question as a String.
+     * @param type Whether the link is an internal or external link.
+     * @return A boolean indicating if the url was added.
+     */
+    public boolean addLink(String raw_url, int type) {
+    ///ystem.out.println("addLink("+url+", "+type+")");
+    if(!encountered_urls.contains(raw_url)) {
                 // Add it to the urls we've seen.
                 encountered_urls.add(raw_url);
+        encountered_urls.add(raw_url);
                 // Add it the to links for the current GURL.
                 // Add it to the progress file count.
                 progress.increaseFileCount();
                 return true;
+          }
           // Regardless add it to the children links of the current GURL
           initial.addLink(raw_url);
           // We've seen it before. Don't count it again.
           return false;
+     }
      public void callWGet() {
           // Build parameter string
           String command = "wget ";
           // Parse arguments into array.
           // Always:
           // rewrite links to be local if possible - NOOOOOO,
           // output a debug file and debug messages,
           // run quietly.
           //command = command + "-k ";
           if(destination != null) {
              command = command + "-P " + destination + " ";
+          }
           if(depth < 0) {
+        progress.increaseFileCount();
+        return true;
+    }
+    // Regardless add it to the children links of the current GURL
+    initial.addLink(raw_url);
+    // We've seen it before. Don't count it again.
+    return false;
+    }
+    public void callWGet() {
+    // Build parameter string
+    String command = "wget ";
+    // Parse arguments into array.
+    // Always:
+    // rewrite links to be local if possible - NOOOOOO,
+    // output a debug file and debug messages,
+    // run quietly.
+    //command = command + "-k ";
+    if(destination != null) {
+        command = command + "-P " + destination + " ";
+    }
+    if(depth < 0) {
                 // Infinite recursion
                 command = command + "-r ";
+          }
           else if (depth == 0) {
+        command = command + "-r ";
+    }
+    else if (depth == 0) {
                 // Just this page.
+          }
           else if (depth > 0) {
+    }
+    else if (depth > 0) {
                 // Recursion to the specified depth.
                 command = command + "-r -l" + depth + " ";
+          }
           if(!clobber || previous_state == Job.PAUSED) {
                 command = command + "-nc -c ";
+          }
           if(proxy_user != null) {
                 command = command + "--proxy-user=" + proxy_user
                      + " --proxy-passwd=" + proxy_pass + " ";
+          }
+        command = command + "-r -l" + depth + " ";
+    }
+    if(!clobber || previous_state == Job.PAUSED) {
+        command = command + "-nc -c ";
+    }
+    if(proxy_user != null) {
+        command = command + "--proxy-user=" + proxy_user
+        + " --proxy-passwd=" + proxy_pass + " ";
+    }
           if(page_requisites) {
                 command = command + "-p ";
+          }
           if(other_hosts) {
                 command = command + "-H ";
+          }
           // Finally tell it the site to download.
           command = command + initial.toString();
           if(previous_state == Job.COMPLETE) {
                 progress.mirrorBegun(true);
+          }
           else {
                 progress.mirrorBegun(false);
+          }
           // Run it
           try {
                 Gatherer.println("Cmd: " + command);
                 Runtime rt = Runtime.getRuntime();
                 Process prcs = rt.exec(command);
                 InputStreamReader isr =
                      new InputStreamReader( prcs.getErrorStream() );
                 BufferedReader br = new BufferedReader( isr );
+    if(page_requisites) {
+        command = command + "-p ";
+    }
+    if(other_hosts) {
+        command = command + "-H ";
+    }
+    // Finally tell it the site to download.
+    command = command + initial.toString();
+    if(previous_state == Job.COMPLETE) {
+        progress.mirrorBegun(true);
+    }
+    else {
+        progress.mirrorBegun(false);
+    }
+    // Run it
+    try {
+        Gatherer.println("Cmd: " + command);
+        Runtime rt = Runtime.getRuntime();
+        Process prcs = rt.exec(command);
+        InputStreamReader isr =
+        new InputStreamReader( prcs.getErrorStream() );
+        BufferedReader br = new BufferedReader( isr );
                 // Capture the standard error stream and seach for two particular
                 // occurances.
                 String line;
                 boolean ignore_for_robots = false;
                 while ((line = br.readLine()) != null) {
                      Gatherer.println(line);
                      // The first magic special test is to see if we've just
                      // asked for the robots.txt file. If so we ignore
                      // the next add and then the next complete/error.
                      if(line.lastIndexOf("robots.txt;") != -1) {
                           Gatherer.println("***** Requesting robot.txt");
                           ignore_for_robots = true;
+                     }
                      // If line contains "=> `" display text as the
                      // currently downloading url. Unique to add download.
                      else if(line.lastIndexOf("=> `") != -1) {
                           if(!ignore_for_robots) {
                                 // Add download
                                 String new_url =
                                      line.substring(line.indexOf("`") + 1,
                                                          line.lastIndexOf("'"));
                                 // Remove the destination guff
                                 if(destination != null) {
                                      new_url = new_url.substring(destination.length());
+                                }
                                 addDownload("http:/" + new_url);
+                          }
+                     }
                      // If line contains "saved [<size>]" set currently
                      // downloading url to "Download Complete".
                      else if(line.lastIndexOf(") - `") != -1) {
                           if(!ignore_for_robots) {
                                 // Download complete
                                 downloadComplete();
+                          }
                           else {
                                 ignore_for_robots = false;
+                          }
+                     }
                      // The already there line begins "File `..." However this
                      // is only true in english, so instead I looked and there
                      // are few (if any at all) other messages than those above
                      // and not overwriting messages that use " `" so we'll
                      // look for that. Note this method is not guarenteed to be
                      // unique like the previous two.
                      else if(line.lastIndexOf(" `") != -1) {
                           // Not Overwriting
                           Gatherer.println("Already there.");
                           String new_url =
                                 line.substring(line.indexOf("`") + 1,
                                                     line.lastIndexOf("'"));
                           // Remove the destination guff
                           if(destination != null) {
                                 new_url = new_url.substring(destination.length());
+                          }
                           addDownload("http:/" + new_url);
                           downloadWarning();
+                     }
                      // Any other important message starts with the time in the form hh:mm:ss
                      else if(line.length() > 7) {
                           if(line.charAt(2) == ':' && line.charAt(5) == ':') {
                                 if(!ignore_for_robots) {
                                      Gatherer.println("Error.");
                                      downloadFailed();
+                                }
                                 else {
                                      ignore_for_robots = false;
+                                }
+                          }
+                     }
+                }
+        String line;
+        boolean ignore_for_robots = false;
+        while ((line = br.readLine()) != null) {
+        Gatherer.println(line);
+        // The first magic special test is to see if we've just
+        // asked for the robots.txt file. If so we ignore
+        // the next add and then the next complete/error.
+        if(line.lastIndexOf("robots.txt;") != -1) {
+            Gatherer.println("***** Requesting robot.txt");
+            ignore_for_robots = true;
+        }
+        // If line contains "=> `" display text as the
+        // currently downloading url. Unique to add download.
+        else if(line.lastIndexOf("=> `") != -1) {
+            if(!ignore_for_robots) {
+            // Add download
+            String new_url =
+                line.substring(line.indexOf("`") + 1,
+                       line.lastIndexOf("'"));
+            // Remove the destination guff
+            if(destination != null) {
+                new_url = new_url.substring(destination.length());
+            }
+            addDownload("http:/" + new_url);
+            }
+        }
+        // If line contains "saved [<size>]" set currently
+        // downloading url to "Download Complete".
+        else if(line.lastIndexOf(") - `") != -1) {
+            if(!ignore_for_robots) {
+            // Download complete
+            downloadComplete();
+            }
+            else {
+            ignore_for_robots = false;
+            }
+        }
+        // The already there line begins "File `..." However this
+        // is only true in english, so instead I looked and there
+        // are few (if any at all) other messages than those above
+        // and not overwriting messages that use " `" so we'll
+        // look for that. Note this method is not guarenteed to be
+        // unique like the previous two.
+        else if(line.lastIndexOf(" `") != -1) {
+            // Not Overwriting
+            Gatherer.println("Already there.");
+            String new_url =
+            line.substring(line.indexOf("`") + 1,
+                       line.lastIndexOf("'"));
+            // Remove the destination guff
+            if(destination != null) {
+            new_url = new_url.substring(destination.length());
+            }
+            addDownload("http:/" + new_url);
+            downloadWarning();
+        }
+        // Any other important message starts with the time in the form hh:mm:ss
+        else if(line.length() > 7) {
+            if(line.charAt(2) == ':' && line.charAt(5) == ':') {
+            if(!ignore_for_robots) {
+                Gatherer.println("Error.");
+                downloadFailed();
+            }
+            else {
+                ignore_for_robots = false;
+            }
+            }
+        }
+        }
                 // Now display final message based on exit value
                 prcs.waitFor();
           } catch (Exception ioe) {
+        prcs.waitFor();
+    } catch (Exception ioe) {
                 //message(Utility.ERROR, ioe.toString());
                 Gatherer.printStackTrace(ioe);
+          }
           // If we've got to here and the state isn't STOPPED then the
           // job is complete.
           if(state == Job.RUNNING) {
                 progress.mirrorComplete();
                 previous_state = state;
                 state = Job.COMPLETE;
+          }
+    }
      /** The most important part of the Job class, this method is
       * responsible for calling the WGet native methods used to
       * mirror the indicated url. By this stage all the variables
       * necessary should be set and we need only build up the
       * parameter string and make the call.
       */
      public void callWGetNative() {
           Vector args = new Vector();
           // Let the GProgressBar know we're starting, just in case
           // the user hasn't told us to. If this is the second time the
           // urls downloaded and the first attempt was successful (ie
           // the previous job was complete), then we have the case where
           // the user is forcing us to remirror. Reset all the values etc
           // if this is the case then reset the variables.
           // Note that this can cause the result line to look something
           // like this.
           // Downloaded 12 of 12 files (8 warnings, 0 errors).
           // The warnings would be something like, 'File already downloaded'
           // but the total number of files and the file successfully
           // downloaded will be correct.
           if(previous_state == Job.COMPLETE) {
                 progress.mirrorBegun(true);
+          }
           else {
                 progress.mirrorBegun(false);
+          }
           // Parse arguments into array.
           args.add(Utility.BASE_DIR + "wget");
           //args.add("-k");
           args.add("-d");
           args.add("-o");
           args.add("debug.txt");
+        Gatherer.printStackTrace(ioe);
+    }
+    // If we've got to here and the state isn't STOPPED then the
+    // job is complete.
+    if(state == Job.RUNNING) {
+        progress.mirrorComplete();
+        previous_state = state;
+        state = Job.COMPLETE;
+    }
+    }
+    /** The most important part of the Job class, this method is
+     * responsible for calling the WGet native methods used to
+     * mirror the indicated url. By this stage all the variables
+     * necessary should be set and we need only build up the
+     * parameter string and make the call.
+     */
+    public void callWGetNative() {
+    Vector args = new Vector();
+    // Let the GProgressBar know we're starting, just in case
+    // the user hasn't told us to. If this is the second time the
+    // urls downloaded and the first attempt was successful (ie
+    // the previous job was complete), then we have the case where
+    // the user is forcing us to remirror. Reset all the values etc
+    // if this is the case then reset the variables.
+    // Note that this can cause the result line to look something
+    // like this.
+    // Downloaded 12 of 12 files (8 warnings, 0 errors).
+    // The warnings would be something like, 'File already downloaded'
+    // but the total number of files and the file successfully
+    // downloaded will be correct.
+    if(previous_state == Job.COMPLETE) {
+        progress.mirrorBegun(true);
+    }
+    else {
+        progress.mirrorBegun(false);
+    }
+    // Parse arguments into array.
+    args.add(Utility.BASE_DIR + "wget");
+    //args.add("-k");
+    args.add("-d");
+    args.add("-o");
+    args.add("debug.txt");
           if(destination != null) {
              args.add("-P");
              args.add(destination);
+          }
           if(depth < 0) {
+    if(destination != null) {
+        args.add("-P");
+        args.add(destination);
+    }
+    if(depth < 0) {
                 // Infinite recursion
                 args.add("-r");
+          }
           else if (depth == 0) {
+        args.add("-r");
+    }
+    else if (depth == 0) {
                 // Just this page.
+          }
           else if (depth > 0) {
+    }
+    else if (depth > 0) {
                 // Recursion to the specified depth.
                 args.add("-r");
                 args.add("-l");
                 args.add("" + depth + ""); // Hacky
+          }
           if(!clobber || previous_state == PAUSED) {
                 args.add("-nc");
                 args.add("-c");
+          }
           if(proxy_user != null) {
                 args.add("--proxy-user=" + proxy_user);
                 args.add("--proxy-passwd=" + proxy_pass);
+          }
+        args.add("-r");
+        args.add("-l");
+        args.add("" + depth + ""); // Hacky
+    }
+    if(!clobber || previous_state == PAUSED) {
+        args.add("-nc");
+        args.add("-c");
+    }
+    if(proxy_user != null) {
+        args.add("--proxy-user=" + proxy_user);
+        args.add("--proxy-passwd=" + proxy_pass);
+    }
           if(page_requisites) {
                 args.add("-p");
+          }
           if(quiet) {
              args.add("-q");
+          }
           if(other_hosts) {
              args.add("-H");
+          }
           args.add(initial.toString());
           Gatherer.println("Calling wget ");
           for(Enumeration e = args.elements(); e.hasMoreElements();) {
                 Gatherer.println(e.nextElement() + " ");
+          }
           Gatherer.println("");
           // Run home to mummy.
           int value = mummy.wget(args.size(), args.toArray(), debug);
           // If we've got to here and the state isn't STOPPED then the job is complete.
           if(state == RUNNING) {
                 progress.mirrorComplete();
                 previous_state = state;
                 state = COMPLETE;
+          }
+     }
      /** Called by the WGet native code when the current download is
       * completed. In turn all download listeners are informed.
       */
      public void downloadComplete() {
           progress.downloadComplete();
           /* @todo
               model.add(url.getURL(), destination);
           */
           url = null;
           current_url = null;
+     }
+    if(page_requisites) {
+        args.add("-p");
+    }
+    if(quiet) {
+        args.add("-q");
+    }
+    if(other_hosts) {
+        args.add("-H");
+    }
+    args.add(initial.toString());
+    Gatherer.println("Calling wget ");
+    for(Enumeration e = args.elements(); e.hasMoreElements();) {
+        Gatherer.println(e.nextElement() + " ");
+    }
+    Gatherer.println("");
+    // Run home to mummy.
+    int value = mummy.wget(args.size(), args.toArray(), debug);
+    // If we've got to here and the state isn't STOPPED then the job is complete.
+    if(state == RUNNING) {
+        progress.mirrorComplete();
+        previous_state = state;
+        state = COMPLETE;
+    }
+    }
+    /** Called by the WGet native code when the current download is
+     * completed. In turn all download listeners are informed.
+     */
+    public void downloadComplete() {
+    progress.downloadComplete();
+    /* @todo
+       model.add(url.getURL(), destination);
+    */
+    url = null;
+    current_url = null;
+    }
      /** Called by the WGet native code when the requested download returns
       * a status code other than 200.
       */
      public void downloadFailed() {
           ///ystem.out.println("downloadFailed("+current_url+")");
           failed_urls.add(current_url); // Its the current url thats failed.
           progress.downloadFailed();
+     }
+    /** Called by the WGet native code when the requested download returns
+     * a status code other than 200.
+     */
+    public void downloadFailed() {
+    ///ystem.out.println("downloadFailed("+current_url+")");
+    failed_urls.add(current_url); // Its the current url thats failed.
+    progress.downloadFailed();
+    }
      /**
       */
      public void downloadWarning() {
           progress.downloadWarning();
+     }
      /**
       * @return A String representing the currently downloading url.
       */
      public String getCurrent() {
           return current_url;
+     }
      /**
       * @return A String representing the initial urls host (root node
       * of tree that we are mirroring).
       */
      public String getHost() {
           return url.getHost();
+     }
   /**
     * @return Returns the progress bar associated with this job.
     */
   public GProgressBar getProgressBar() {
      return progress;
+  }
      /** Called to discover if the user wanted this thread to run or if
       * it is paused.
       * @return An int representing the current Job state.
       */
      public int getState() {
           return state;
+     }
      /** Returns the current state of the stop flag for this job.
       * @return A boolean representing whether the user has requested to
       * stop.
       */
      public boolean hasSignalledStop() {
           if(state == Job.STOPPED || state == Job.PAUSED ||
               state == Job.COMPLETE) {
                 return true;
+          }
           return false;
+     }
      /** A convinence call.
       * @return A String representing the url of the initial url (root node of the mirrored tree).
       */
      public String toString() {
           return initial.toString();
+     }
      /** Called by the WGet native code to signal the current progress of
       * downloading.
       * @param current A long representing the number of bytes that have
       * been downloaded since the last update.
       * @param expected A long representing the total number of bytes
       * expected for this download.
       */
      public void updateProgress(long current, long expected) {
         progress.updateProgress(current, expected);
+     }
+    /**
+     */
+    public void downloadWarning() {
+    progress.downloadWarning();
+    }
+    /**
+     * @return A String representing the currently downloading url.
+     */
+    public String getCurrent() {
+    return current_url;
+    }
+    /**
+     * @return A String representing the initial urls host (root node
+     * of tree that we are mirroring).
+     */
+    public String getHost() {
+    return url.getHost();
+    }
+    /**
+     * @return Returns the progress bar associated with this job.
+     */
+    public GProgressBar getProgressBar() {
+    return progress;
+    }
+    /** Called to discover if the user wanted this thread to run or if
+     * it is paused.
+     * @return An int representing the current Job state.
+     */
+    public int getState() {
+    return state;
+    }
+    /** Returns the current state of the stop flag for this job.
+     * @return A boolean representing whether the user has requested to
+     * stop.
+     */
+    public boolean hasSignalledStop() {
+    if(state == Job.STOPPED || state == Job.PAUSED ||
+       state == Job.COMPLETE) {
+        return true;
+    }
+    return false;
+    }
+    /** A convinence call.
+     * @return A String representing the url of the initial url (root node of the mirrored tree).
+     */
+    public String toString() {
+    return initial.toString();
+    }
+    /** Called by the WGet native code to signal the current progress of
+     * downloading.
+     * @param current A long representing the number of bytes that have
+     * been downloaded since the last update.
+     * @param expected A long representing the total number of bytes
+     * expected for this download.
+     */
+    public void updateProgress(long current, long expected) {
+    progress.updateProgress(current, expected);
+    }
+}

trunk/gli/src/org/greenstone/gatherer/collection/LoadCollectionBox.java

-              r4293
+              r4366
 public class LoadCollectionBox {
      private JFileChooser chooser = null;
      public LoadCollectionBox() {
+     }
+    private JFileChooser chooser = null;
+    public LoadCollectionBox() {
+    }
      public String getFileName() {
           String defaultPath = Utility.getCollectionDir(Gatherer.config.gsdl_path);
           chooser = new JFileChooser(new File(defaultPath));
           chooser.setDialogTitle(Gatherer.dictionary.get("SaveCollectionBox.Title"));
           ExtensionFileFilter filter1 = new ExtensionFileFilter(".col", Gatherer.dictionary.get("General.File_Description"));
           chooser.setFileFilter(filter1);
           chooser.setAcceptAllFileFilterUsed(false);
           int return_val = chooser.showOpenDialog(null);
           if(return_val == JFileChooser.APPROVE_OPTION) {
                 return chooser.getSelectedFile().getAbsolutePath();
+          }
           else {
                 return null;
+          }
+     }
+    public String getFileName() {
+    String defaultPath = Utility.getCollectionDir(Gatherer.config.gsdl_path);
+    chooser = new JFileChooser(new File(defaultPath));
+    chooser.setDialogTitle(Gatherer.dictionary.get("SaveCollectionBox.Title"));
+    ExtensionFileFilter filter1 = new ExtensionFileFilter(".col", Gatherer.dictionary.get("General.File_Description"));
+    chooser.setFileFilter(filter1);
+    chooser.setAcceptAllFileFilterUsed(false);
+    int return_val = chooser.showOpenDialog(null);
+    if(return_val == JFileChooser.APPROVE_OPTION) {
+        return chooser.getSelectedFile().getAbsolutePath();
+    }
+    else {
+        return null;
+    }
+    }
+}

trunk/gli/src/org/greenstone/gatherer/collection/SaveCollectionBox.java

-              r4293
+              r4366
 /** Provides a prompt allowing the user some choice in whether a collection saves. */
 public class SaveCollectionBox
      extends JDialog
      implements ActionListener{
      /** What option the user has choosen. */
      private int result = 0;
      /** Button to cancel prompt, no save. */
      private JButton cancel = null;
      /** Button for no save. */
      private JButton no = null;
      /** Button to save. */
      private JButton yes = null;
      /** A reference to ourselves so our inner classes can dispose of us. */
      private SaveCollectionBox myself = null;
      /** Result value if the user has choosen cancel. */
      static final public int SAVE_CANCEL  = 0;
      /** Result value if the user has choosen no. */
      static final public int SAVE_NO      = 1;
      /** Result value if the user has choosen yes. */
      static final public int SAVE_YES     = 2;
      /** Construtor. */
      public SaveCollectionBox() {
           super(Gatherer.g_man);
           this.myself = this;
           result = SAVE_CANCEL;
           // Dialog setup
           this.setModal(true);
           this.setTitle(get("Title"));
           this.setSize(360,100);
+     }
      /** Any implementation of <i>ActionListener</i> must include this method so that we can be informed when an action has occured. In this case we see what button the users clicked, set the appropriate result then dispose of the dialog. */
      public void actionPerformed(ActionEvent event) {
           if(event.getSource() == yes) {
                 result = SAVE_YES;
                 this.dispose();
           } else if(event.getSource() == no) {
                 result = SAVE_NO;
                 this.dispose();
           } else if(event.getSource() == cancel) {
                 result = SAVE_CANCEL;
                 this.dispose();
+          }
+     }
      /** Destructor. */
      public void destroy() {
           cancel = null;
           no.removeActionListener(this);
           no = null;
           yes.removeActionListener(this);
           yes = null;
           myself = null;
           rootPane = null;
+     }
      /** Displays the prompt by first building the controls, then waits for a user selection.
+    extends JDialog
+    implements ActionListener{
+    /** What option the user has choosen. */
+    private int result = 0;
+    /** Button to cancel prompt, no save. */
+    private JButton cancel = null;
+    /** Button for no save. */
+    private JButton no = null;
+    /** Button to save. */
+    private JButton yes = null;
+    /** A reference to ourselves so our inner classes can dispose of us. */
+    private SaveCollectionBox myself = null;
+    /** Result value if the user has choosen cancel. */
+    static final public int SAVE_CANCEL  = 0;
+    /** Result value if the user has choosen no. */
+    static final public int SAVE_NO      = 1;
+    /** Result value if the user has choosen yes. */
+    static final public int SAVE_YES     = 2;
+    /** Construtor. */
+    public SaveCollectionBox() {
+    super(Gatherer.g_man);
+    this.myself = this;
+    result = SAVE_CANCEL;
+    // Dialog setup
+    this.setModal(true);
+    this.setTitle(get("Title"));
+    this.setSize(360,100);
+    }
+    /** Any implementation of <i>ActionListener</i> must include this method so that we can be informed when an action has occured. In this case we see what button the users clicked, set the appropriate result then dispose of the dialog. */
+    public void actionPerformed(ActionEvent event) {
+    if(event.getSource() == yes) {
+        result = SAVE_YES;
+        this.dispose();
+    } else if(event.getSource() == no) {
+        result = SAVE_NO;
+        this.dispose();
+    } else if(event.getSource() == cancel) {
+        result = SAVE_CANCEL;
+        this.dispose();
+    }
+    }
+    /** Destructor. */
+    public void destroy() {
+    cancel = null;
+    no.removeActionListener(this);
+    no = null;
+    yes.removeActionListener(this);
+    yes = null;
+    myself = null;
+    rootPane = null;
+    }
+    /** Displays the prompt by first building the controls, then waits for a user selection.
       * @param name The name of the current collection as a <strong>String</strong>.
       */
      public int getUserOption(String name) {
           JPanel content_pane = (JPanel) this.getContentPane();
           content_pane.setBorder(BorderFactory.createEmptyBorder(5,5,5,5));
           content_pane.setLayout(new GridLayout(2,1));
+    public int getUserOption(String name) {
+    JPanel content_pane = (JPanel) this.getContentPane();
+    content_pane.setBorder(BorderFactory.createEmptyBorder(5,5,5,5));
+    content_pane.setLayout(new GridLayout(2,1));
           String args[] = new String[1];
           args[0] = name;
           JLabel save_label = new JLabel(get("Label", args));
           content_pane.add(save_label);
           JPanel button_pane = new JPanel(new GridLayout(1,3));
           content_pane.add(button_pane);
           // We add both mnemonics and key listener so that the 'y' of yes is underlined, but pressing just [Y] (rather than [CTL]-[Y]) performs a systematic click.
           yes = new JButton(get("General.Yes"));
           yes.addActionListener(this);
           KeyListenerImpl key_listener = new KeyListenerImpl();
           yes.addKeyListener(key_listener);
           yes.setMnemonic(KeyEvent.VK_Y);
           button_pane.add(yes);
           no = new JButton(get("General.No"));
           no.addActionListener(this);
           no.addKeyListener(key_listener);
           no.setMnemonic(KeyEvent.VK_N);
           button_pane.add(no);
           cancel = new JButton(get("General.Cancel"));
           cancel.addActionListener(this);
           cancel.addKeyListener(key_listener);
           cancel.setMnemonic(KeyEvent.VK_C);
           button_pane.add(cancel);
           // Center on screen.
           Dimension dlgSize = getSize();
           Dimension frmSize = Gatherer.g_man.getSize();
           Point loc = Gatherer.g_man.getLocation();
           setLocation((frmSize.width - dlgSize.width) / 2 + loc.x, (frmSize.height - dlgSize.height) / 2 + loc.y);
           show();
           // Deallocate things we allocated here.
           yes.removeKeyListener(key_listener);
           no.removeKeyListener(key_listener);
           cancel.removeKeyListener(key_listener);
           key_listener = null;
           content_pane = null;
           args = null;
           save_label = null;
           button_pane = null;
           dlgSize = null;
           frmSize = null;
           loc = null;
           return result;
+     }
      /** Method to retrieve a phrase from the dictionary based of a key.
+    String args[] = new String[1];
+    args[0] = name;
+    JLabel save_label = new JLabel(get("Label", args));
+    content_pane.add(save_label);
+    JPanel button_pane = new JPanel(new GridLayout(1,3));
+    content_pane.add(button_pane);
+    // We add both mnemonics and key listener so that the 'y' of yes is underlined, but pressing just [Y] (rather than [CTL]-[Y]) performs a systematic click.
+    yes = new JButton(get("General.Yes"));
+    yes.addActionListener(this);
+    KeyListenerImpl key_listener = new KeyListenerImpl();
+    yes.addKeyListener(key_listener);
+    yes.setMnemonic(KeyEvent.VK_Y);
+    button_pane.add(yes);
+    no = new JButton(get("General.No"));
+    no.addActionListener(this);
+    no.addKeyListener(key_listener);
+    no.setMnemonic(KeyEvent.VK_N);
+    button_pane.add(no);
+    cancel = new JButton(get("General.Cancel"));
+    cancel.addActionListener(this);
+    cancel.addKeyListener(key_listener);
+    cancel.setMnemonic(KeyEvent.VK_C);
+    button_pane.add(cancel);
+    // Center on screen.
+    Dimension dlgSize = getSize();
+    Dimension frmSize = Gatherer.g_man.getSize();
+    Point loc = Gatherer.g_man.getLocation();
+    setLocation((frmSize.width - dlgSize.width) / 2 + loc.x, (frmSize.height - dlgSize.height) / 2 + loc.y);
+    show();
+    // Deallocate things we allocated here.
+    yes.removeKeyListener(key_listener);
+    no.removeKeyListener(key_listener);
+    cancel.removeKeyListener(key_listener);
+    key_listener = null;
+    content_pane = null;
+    args = null;
+    save_label = null;
+    button_pane = null;
+    dlgSize = null;
+    frmSize = null;
+    loc = null;
+    return result;
+    }
+    /** Method to retrieve a phrase from the dictionary based of a key.
       * @param key A <strong>String</strong> used to find the correct phrase.
       * @return A <strong>String</strong> containing the correct phrase with the correct formatting.
       */
      private String get(String key) {
           return get(key, null);
+     }
      /** Method to retrieve a phrase from the dictionary based of a key and including arguments.
+    private String get(String key) {
+    return get(key, null);
+    }
+    /** Method to retrieve a phrase from the dictionary based of a key and including arguments.
       * @param key A <strong>String</strong> used to find the correct phrase.
       * @param args A <strong>String[]</strong> of arguments used in formatting and filling out the phrase.
       * @return A <strong>String</strong> containing the correct phrase with the correct formatting.
       */
      private String get(String key, String args[]) {
           if(key.indexOf('.') == -1) {
                 key = "SaveCollectionBox." + key;
+          }
           return Gatherer.dictionary.get(key, args);
+     }
      /** Listens for key presses when the focus is on one of the buttons. Note that the key pressed needn't be the one associated with the button in focus. */
      private class KeyListenerImpl
           extends KeyAdapter {
           /** Any extension of KeyAdapter can override this method so that we can be informed whenever a key is released (ie after a keyTyped event). In this case we map the key press to an appropriate click on one of the buttons (not necessarily the one the key release was detected on).
             * @param event A <strong>KeyEvent</strong> containing details about the key release event.
+    private String get(String key, String args[]) {
+    if(key.indexOf('.') == -1) {
+        key = "SaveCollectionBox." + key;
+    }
+    return Gatherer.dictionary.get(key, args);
+    }
+    /** Listens for key presses when the focus is on one of the buttons. Note that the key pressed needn't be the one associated with the button in focus. */
+    private class KeyListenerImpl
+    extends KeyAdapter {
+    /** Any extension of KeyAdapter can override this method so that we can be informed whenever a key is released (ie after a keyTyped event). In this case we map the key press to an appropriate click on one of the buttons (not necessarily the one the key release was detected on).
+     * @param event A <strong>KeyEvent</strong> containing details about the key release event.
             */
           public void keyReleased(KeyEvent event) {
                 if(event.getKeyCode() == KeyEvent.VK_Y) {
                      yes.doClick(10);
+                }
                 else if(event.getKeyCode() == KeyEvent.VK_N) {
                      no.doClick(10);
+                }
                 else if(event.getKeyCode() == KeyEvent.VK_C) {
                      cancel.doClick(10);
+                }
+          }
+     }
+    public void keyReleased(KeyEvent event) {
+        if(event.getKeyCode() == KeyEvent.VK_Y) {
+        yes.doClick(10);
+        }
+        else if(event.getKeyCode() == KeyEvent.VK_N) {
+        no.doClick(10);
+        }
+        else if(event.getKeyCode() == KeyEvent.VK_C) {
+        cancel.doClick(10);
+        }
+    }
+    }
+}

trunk/gli/src/org/greenstone/gatherer/collection/SaveCollectionTask.java

-              r4293
+              r4366
  */
 public class SaveCollectionTask
      extends Thread {
      private boolean close_after = false;
      /** Should we exit the Gatherer once this save is complete. */
      private boolean exit_after = false;
      /** Do we run the import scripts once this save is complete. */
      private boolean import_after = false;
      /** The current collection. */
      private Collection collection = null;
      /** The filename of the collection we are saving. */
      private String name = null;
      static final private int CLOSE_COLLECTION     = 0;
      static final private int COLLECTION_COPIED    = 1;
      static final private int COLLECTION_SAVED     = 2;
      static final private int COLLECTION_CFG_SAVED = 3;
      static final private int COPY_COLLECTION      = 4;
      static final private int MAKE_COLLECTION      = 5;
      static final private int METADATA_SAVED       = 6;
      static final private int METADATA_XML_SAVED   = 7;
      static final private int OPEN_COLLECTION      = 8;
      static final private int RESTORE_COLLECTION   = 9;
      /** Constructor.
       * @param name The filename of the collection we are saving as.
       */
      public SaveCollectionTask(Collection collection) {
           this.collection = collection;
+     }
      /** Constructor.
       * @param exit_after <i>true</i> to cause the Gatherer to exit once save is complete, <i>false</i> otherwise.
       */
      public SaveCollectionTask(Collection collection, boolean close_after, boolean exit_after) {
           this.close_after = close_after;
           this.collection = collection;
           this.exit_after = exit_after;
+     }
      /** Constructor.
       * @param name The filename of the collection we are saving as.
       */
      public SaveCollectionTask(Collection collection, String name) {
           this.collection = collection;
           this.name = name;
+     }
      /** <p>This method, when created in a forked process by start(), performs the actions necessary to save a collection. If this is a regular save it saves the state of the current collection, ensuring all files, metadata files, and configuration files are written to disk. If, instead, this is a "Save As" action then there as several more steps involved:</p>
       * <p>1. Perform a regular collection save on what we will later refer to as the origin collection.</p>
       * <p>2. Call CollectionManager.makeCollection() to create the collection structure to save into (copied collection).</p>
       * <p>3. Copy files from the origin to the copied collections (except special collection files ending with ~).</p>
       * <p>4. Restore origin collection by undoing file copy actions and removing the ~ from the end of collection files.</p>
       * <p>5. Close the origin collection.</p>
       * <p>6. Open the copied collection.</p>
       * <p>Of course all of this takes a while, and depends on several other bits of code to work properly.</p>.
       * @see org.greenstone.gatherer.collection.Collection
       * @see org.greenstone.gatherer.collection.CollectionModel
       * @see org.greenstone.gatherer.gui.GUIManager
       * @see org.greenstone.gatherer.gui.GConfigPane
       * @see org.greenstone.gatherer.msm.MetadataSetManager
       * @see org.greenstone.gatherer.util.Utility
       */
      public void run() {
           // Change cursor to hourglass.
           Gatherer.g_man.wait(true);
           // Create progress monitor box. It will display itself as necessary.
           ProgressMonitor spd = new ProgressMonitor(Gatherer.g_man, Gatherer.dictionary.get("SaveProgressDialog.Title", collection.getName()), null, 0, 100);
           spd.setMillisToDecideToPopup(100);
           spd.setMillisToPopup(100);
           // 0. Force all remaining metadata.xml files to load.
           // 1. Perform a regular collection save on what we will later refer to as the origin collection.
           ///ystem.err.println("1. Save origin.");
           String tmp_loc = Gatherer.c_man.getCollectionFilename();
           String args[] = new String[1];
           args[0] = collection.getName() + ".col";
           try {
+    extends Thread {
+    private boolean close_after = false;
+    /** Should we exit the Gatherer once this save is complete. */
+    private boolean exit_after = false;
+    /** Do we run the import scripts once this save is complete. */
+    private boolean import_after = false;
+    /** The current collection. */
+    private Collection collection = null;
+    /** The filename of the collection we are saving. */
+    private String name = null;
+    static final private int CLOSE_COLLECTION     = 0;
+    static final private int COLLECTION_COPIED    = 1;
+    static final private int COLLECTION_SAVED     = 2;
+    static final private int COLLECTION_CFG_SAVED = 3;
+    static final private int COPY_COLLECTION      = 4;
+    static final private int MAKE_COLLECTION      = 5;
+    static final private int METADATA_SAVED       = 6;
+    static final private int METADATA_XML_SAVED   = 7;
+    static final private int OPEN_COLLECTION      = 8;
+    static final private int RESTORE_COLLECTION   = 9;
+    /** Constructor.
+     * @param name The filename of the collection we are saving as.
+     */
+    public SaveCollectionTask(Collection collection) {
+    this.collection = collection;
+    }
+    /** Constructor.
+     * @param exit_after <i>true</i> to cause the Gatherer to exit once save is complete, <i>false</i> otherwise.
+     */
+    public SaveCollectionTask(Collection collection, boolean close_after, boolean exit_after) {
+    this.close_after = close_after;
+    this.collection = collection;
+    this.exit_after = exit_after;
+    }
+    /** Constructor.
+     * @param name The filename of the collection we are saving as.
+     */
+    public SaveCollectionTask(Collection collection, String name) {
+    this.collection = collection;
+    this.name = name;
+    }
+    /** <p>This method, when created in a forked process by start(), performs the actions necessary to save a collection. If this is a regular save it saves the state of the current collection, ensuring all files, metadata files, and configuration files are written to disk. If, instead, this is a "Save As" action then there as several more steps involved:</p>
+     * <p>1. Perform a regular collection save on what we will later refer to as the origin collection.</p>
+     * <p>2. Call CollectionManager.makeCollection() to create the collection structure to save into (copied collection).</p>
+     * <p>3. Copy files from the origin to the copied collections (except special collection files ending with ~).</p>
+     * <p>4. Restore origin collection by undoing file copy actions and removing the ~ from the end of collection files.</p>
+     * <p>5. Close the origin collection.</p>
+     * <p>6. Open the copied collection.</p>
+     * <p>Of course all of this takes a while, and depends on several other bits of code to work properly.</p>.
+     * @see org.greenstone.gatherer.collection.Collection
+     * @see org.greenstone.gatherer.collection.CollectionModel
+     * @see org.greenstone.gatherer.gui.GUIManager
+     * @see org.greenstone.gatherer.gui.GConfigPane
+     * @see org.greenstone.gatherer.msm.MetadataSetManager
+     * @see org.greenstone.gatherer.util.Utility
+     */
+    public void run() {
+    // Change cursor to hourglass.
+    Gatherer.g_man.wait(true);
+    // Create progress monitor box. It will display itself as necessary.
+    ProgressMonitor spd = new ProgressMonitor(Gatherer.g_man, Gatherer.dictionary.get("SaveProgressDialog.Title", collection.getName()), null, 0, 100);
+    spd.setMillisToDecideToPopup(100);
+    spd.setMillisToPopup(100);
+    // 0. Force all remaining metadata.xml files to load.
+    // 1. Perform a regular collection save on what we will later refer to as the origin collection.
+    ///ystem.err.println("1. Save origin.");
+    String tmp_loc = Gatherer.c_man.getCollectionFilename();
+    String args[] = new String[1];
+    args[0] = collection.getName() + ".col";
+    try {
                 // Block until all of the metadata files have been read in.
                 collection.gdm.waitUntilComplete();
+        collection.gdm.waitUntilComplete();
                 // Write out the metadata xml files. The destroy below is meant to do this, but never does.
                 collection.gdm.save();
+        collection.gdm.save();
                 spd.setProgress(getValue(METADATA_XML_SAVED));
                 File file = new File(tmp_loc);
+        spd.setProgress(getValue(METADATA_XML_SAVED));
+        File file = new File(tmp_loc);
                 // Create backup
                 if(file.exists()) {
                      File backup = new File(tmp_loc + "~");
                      backup.deleteOnExit();
                      if(!file.renameTo(backup)) {
                           Gatherer.println("Error in CollectionManager.load(): FileNotRenamedException");
+                     }
+                }
+        if(file.exists()) {
+        File backup = new File(tmp_loc + "~");
+        backup.deleteOnExit();
+        if(!file.renameTo(backup)) {
+            Gatherer.println("Error in CollectionManager.load(): FileNotRenamedException");
+        }
+        }
                 // Carry on.
                 collection.save();
                 spd.setProgress(getValue(COLLECTION_SAVED));
+        collection.save();
+        spd.setProgress(getValue(COLLECTION_SAVED));
                 // Write out the collection configuration file.
                 Gatherer.g_man.config_pane.saveConfiguration();
                 spd.setProgress(getValue(COLLECTION_CFG_SAVED));
+        Gatherer.g_man.config_pane.saveConfiguration();
+        spd.setProgress(getValue(COLLECTION_CFG_SAVED));
                 // Write out the metadata files.
                 Gatherer.c_man.msm.save();
                 spd.setProgress(getValue(METADATA_SAVED));
+        Gatherer.c_man.msm.save();
+        spd.setProgress(getValue(METADATA_SAVED));
                 // Clean-up
                 spd.setProgress(100);
+        spd.setProgress(100);
                 ///atherer.g_man.collectionChanged(Gatherer.c_man.ready());
                 collection.setSaved(true);
+          }
           catch (Exception error) {
                 Gatherer.printStackTrace(error);
+          }
           // Now we check whether we've finished, or is this a Save As action, in which case we've got miles to go.
           if(name != null) {
+        collection.setSaved(true);
+    }
+    catch (Exception error) {
+        Gatherer.printStackTrace(error);
+    }
+    // Now we check whether we've finished, or is this a Save As action, in which case we've got miles to go.
+    if(name != null) {
                 // 2. Call CollectionManager.makeCollection() to create the collection structure to save into (copied collection).
                 ///ystem.err.println("2. Make copy.");
                 Gatherer.c_man.createCollection(null, null, name, null, null, null);
                 spd.setProgress(getValue(MAKE_COLLECTION));
+        Gatherer.c_man.createCollection(null, null, name, null, null, null);
+        spd.setProgress(getValue(MAKE_COLLECTION));
                 // 3. Copy files from the origin to the copied collections (except special collection files ending with ~).
                 // As part of this we must rename origin.col to copy.col
                 ///ystem.err.println("3. Copy origin.");
                 ArrayList files = new ArrayList();
                 File collection_file = new File(Gatherer.c_man.getCollectionFilename());
                 File copied_dir = new File(Utility.getCollectionDir(Gatherer.config.gsdl_path) + name);
                 files.add(collection_file.getParentFile());
                 while(files.size() > 0) {
                      File file = (File) files.get(0);
                      files.remove(0);
                      if(file.isDirectory()) {
                           File children[] = file.listFiles();
                           for(int i = 0; i < children.length; i++) {
                                 files.add(children[i]);
+                          }
                           children = null;
+                     }
                      else {
                           // Rename origin.col file.
                           if(file.equals(collection_file)) {
                                 File copied_file = new File(copied_dir, name + ".col");
                                 copy(collection_file, copied_file);
                                 copied_file = null;
+                          }
                           // Exclude *~ files from certain locations and lock.tmp file.
                           else if(!file.getName().endsWith("~") && !file.getName().equals(CollectionManager.LOCK_FILE)) {
                                 StringTokenizer origin = new StringTokenizer(file.getAbsolutePath(), File.separator);
                                 StringTokenizer destin = new StringTokenizer(copied_dir.getAbsolutePath(), File.separator);
                                 while(destin.hasMoreTokens()) {
                                      origin.nextToken();
                                      destin.nextToken();
+                                }
                                 File copied_file = new File(copied_dir.getAbsolutePath());
                                 while(origin.hasMoreTokens()) {
                                      copied_file = new File(copied_file, origin.nextToken());
+                                }
                                 copy(file, copied_file);
                                 copied_file = null;
                                 origin = null;
                                 destin = null;
+                          }
+                     }
                      file = null;
+                }
                 spd.setProgress(getValue(COPY_COLLECTION));
+        ArrayList files = new ArrayList();
+        File collection_file = new File(Gatherer.c_man.getCollectionFilename());
+        File copied_dir = new File(Utility.getCollectionDir(Gatherer.config.gsdl_path) + name);
+        files.add(collection_file.getParentFile());
+        while(files.size() > 0) {
+        File file = (File) files.get(0);
+        files.remove(0);
+        if(file.isDirectory()) {
+            File children[] = file.listFiles();
+            for(int i = 0; i < children.length; i++) {
+            files.add(children[i]);
+            }
+            children = null;
+        }
+        else {
+            // Rename origin.col file.
+            if(file.equals(collection_file)) {
+            File copied_file = new File(copied_dir, name + ".col");
+            copy(collection_file, copied_file);
+            copied_file = null;
+            }
+            // Exclude *~ files from certain locations and lock.tmp file.
+            else if(!file.getName().endsWith("~") && !file.getName().equals(CollectionManager.LOCK_FILE)) {
+            StringTokenizer origin = new StringTokenizer(file.getAbsolutePath(), File.separator);
+            StringTokenizer destin = new StringTokenizer(copied_dir.getAbsolutePath(), File.separator);
+            while(destin.hasMoreTokens()) {
+                origin.nextToken();
+                destin.nextToken();
+            }
+            File copied_file = new File(copied_dir.getAbsolutePath());
+            while(origin.hasMoreTokens()) {
+                copied_file = new File(copied_file, origin.nextToken());
+            }
+            copy(file, copied_file);
+            copied_file = null;
+            origin = null;
+            destin = null;
+            }
+        }
+        file = null;
+        }
+        spd.setProgress(getValue(COPY_COLLECTION));
                 // 4. Restore origin collection by undoing file copy actions and removing the ~ from the end of collection files.
                 ///ystem.err.println("4. Restore origin.");
                 Gatherer.c_man.undo.undoAll();
+        Gatherer.c_man.undo.undoAll();
                 ///ystem.err.println(" - UndoAll complete.");
                 // Recurse collection tree restoring *~
                 files.clear(); // Should be empty anyway.
                 files.add(collection_file.getParentFile());
                 while(files.size() > 0) {
                      File file = (File) files.get(0);
                      files.remove(0);
                      if(file.isDirectory()) {
                           File children[] = file.listFiles();
                           for(int i = 0; i < children.length; i++) {
                                 files.add(children[i]);
+                          }
                           children = null;
+                     }
                      else if(file.getName().endsWith("~")) {
                           String filename = file.getAbsolutePath();
                           File original_file = new File(filename.substring(0, filename.length() - 1));
                           ///ystem.err.println("Renaming " + filename);
                           if(!file.renameTo(original_file)) {
                                 Gatherer.println("Error in SaveCollectionTask.run(): FileRenameException");
+                          }
+                     }
+                }
+        files.clear(); // Should be empty anyway.
+        files.add(collection_file.getParentFile());
+        while(files.size() > 0) {
+        File file = (File) files.get(0);
+        files.remove(0);
+        if(file.isDirectory()) {
+            File children[] = file.listFiles();
+            for(int i = 0; i < children.length; i++) {
+            files.add(children[i]);
+            }
+            children = null;
+        }
+        else if(file.getName().endsWith("~")) {
+            String filename = file.getAbsolutePath();
+            File original_file = new File(filename.substring(0, filename.length() - 1));
+            ///ystem.err.println("Renaming " + filename);
+            if(!file.renameTo(original_file)) {
+            Gatherer.println("Error in SaveCollectionTask.run(): FileRenameException");
+            }
+        }
+        }
                 ///ystem.err.println(" - Restore *~ complete.");
                 spd.setProgress(getValue(RESTORE_COLLECTION));
+        spd.setProgress(getValue(RESTORE_COLLECTION));
                 // 5. Close the origin collection.
                 ///ystem.err.println("5. Close origin.");
                 collection.setSaved(true);
                 Gatherer.c_man.closeCollection();
                 spd.setProgress(getValue(CLOSE_COLLECTION));
+        collection.setSaved(true);
+        Gatherer.c_man.closeCollection();
+        spd.setProgress(getValue(CLOSE_COLLECTION));
                 // 6. Open the copied collection.
                 ///ystem.err.println("6. Open copy.");
                 Gatherer.c_man.loadCollection(copied_dir.getAbsolutePath() + File.separator + name + ".col");
                 spd.setProgress(getValue(OPEN_COLLECTION));
                 copied_dir = null;
+          }
           spd.close();
           spd = null;
           tmp_loc = null;
           args = null;
           // Reset undo queue.
           if(Gatherer.c_man.ready()) {
                 Gatherer.c_man.undo.clear();
+          }
           Gatherer.g_man.wait(false);
           // Now we are finished action any necessary action.
           if(import_after) {
                 Gatherer.c_man.importCollection();
+          }
           if(close_after) {
                 Gatherer.c_man.closeCollection();
+          }
           ///ystem.err.println("Save Complete.");
           if(exit_after) {
                 Gatherer.self.exit();
+          }
+     }
      public void setImportAfter(boolean state) {
           import_after = true;
+     }
      private void copy(File source, File destination) {
           ///ystem.err.println("Copy: " + source.getAbsolutePath());
           ///ystem.err.println("  to: " + destination.getAbsolutePath());
           try {
                 destination.getParentFile().mkdirs();
                 FileInputStream f_in = new FileInputStream(source);
                 FileOutputStream f_out = new FileOutputStream(destination);
                 byte data[] = new byte[Utility.BUFFER_SIZE];
                 int data_size = 0;
                 while((data_size = f_in.read(data, 0, Utility.BUFFER_SIZE)) != -1) {
                      f_out.write(data, 0, data_size);
+                }
                 f_in.close();
                 f_out.close();
+          }
           catch (Exception exception) {
                 Gatherer.printStackTrace(exception);
+          }
+     }
      private int getValue(int reference) {
           double multiplier;
           if(name == null) {
                 multiplier = 1.0;
+          }
           else {
                 multiplier = 0.25;
+          }
           switch(reference) {
           // Standard Save
           case COLLECTION_SAVED:
                 return (int)((double)70 * multiplier);
           case COLLECTION_CFG_SAVED:
           case METADATA_SAVED:
           case METADATA_XML_SAVED:
                 return (int)((double)10 * multiplier);
           // Save As
           case MAKE_COLLECTION:
                 return 5;
           case COPY_COLLECTION:
                 return 30;
           case RESTORE_COLLECTION:
                 return 30;
           case CLOSE_COLLECTION:
                 return 10;
           case OPEN_COLLECTION:
                 return 10;
+          }
           return 0;
+     }
+        Gatherer.c_man.loadCollection(copied_dir.getAbsolutePath() + File.separator + name + ".col");
+        spd.setProgress(getValue(OPEN_COLLECTION));
+        copied_dir = null;
+    }
+    spd.close();
+    spd = null;
+    tmp_loc = null;
+    args = null;
+    // Reset undo queue.
+    if(Gatherer.c_man.ready()) {
+        Gatherer.c_man.undo.clear();
+    }
+    Gatherer.g_man.wait(false);
+    // Now we are finished action any necessary action.
+    if(import_after) {
+        Gatherer.c_man.importCollection();
+    }
+    if(close_after) {
+        Gatherer.c_man.closeCollection();
+    }
+    ///ystem.err.println("Save Complete.");
+    if(exit_after) {
+        Gatherer.self.exit();
+    }
+    }
+    public void setImportAfter(boolean state) {
+    import_after = true;
+    }
+    private void copy(File source, File destination) {
+    ///ystem.err.println("Copy: " + source.getAbsolutePath());
+    ///ystem.err.println("  to: " + destination.getAbsolutePath());
+    try {
+        destination.getParentFile().mkdirs();
+        FileInputStream f_in = new FileInputStream(source);
+        FileOutputStream f_out = new FileOutputStream(destination);
+        byte data[] = new byte[Utility.BUFFER_SIZE];
+        int data_size = 0;
+        while((data_size = f_in.read(data, 0, Utility.BUFFER_SIZE)) != -1) {
+        f_out.write(data, 0, data_size);
+        }
+        f_in.close();
+        f_out.close();
+    }
+    catch (Exception exception) {
+        Gatherer.printStackTrace(exception);
+    }
+    }
+    private int getValue(int reference) {
+    double multiplier;
+    if(name == null) {
+        multiplier = 1.0;
+    }
+    else {
+        multiplier = 0.25;
+    }
+    switch(reference) {
+        // Standard Save
+    case COLLECTION_SAVED:
+        return (int)((double)70 * multiplier);
+    case COLLECTION_CFG_SAVED:
+    case METADATA_SAVED:
+    case METADATA_XML_SAVED:
+        return (int)((double)10 * multiplier);
+        // Save As
+    case MAKE_COLLECTION:
+        return 5;
+    case COPY_COLLECTION:
+        return 30;
+    case RESTORE_COLLECTION:
+        return 30;
+    case CLOSE_COLLECTION:
+        return 10;
+    case OPEN_COLLECTION:
+        return 10;
+    }
+    return 0;
+    }
+}

trunk/gli/src/org/greenstone/gatherer/file/FileAlreadyExistsException.java

-              r4293
+              r4366
 public class FileAlreadyExistsException
      extends Exception {
+    extends Exception {
      public FileAlreadyExistsException() {
           super();
+     }
+    public FileAlreadyExistsException() {
+    super();
+    }
+}

trunk/gli/src/org/greenstone/gatherer/file/FileAssociation.java

-              r4293
+              r4366
  */
 public class FileAssociation {
      /** The file extension, most likely three or four letters. */
      private String extension;
      /** The command string, which may include %1 which should be replaced with the target files name. */
      private String command;
      public FileAssociation(String extension, String command) {
           this.command = command;
           this.extension = extension;
+     }
      /** Retrieve the command from this association.
       * @return The command as a <strong>String</strong>.
       */
      public String getCommand() {
           return command;
+     }
      /** Retrieve the extension from this association.
       * @return The extension as a <strong>String</strong>.
       */
      public String getExtension() {
           return extension;
+     }
      /** Set the command for this file association.
       * @param command The new command as a <strong>String</strong>.
       */
      public void setCommand(String command) {
           this.command = command;
+     }
+    /** The file extension, most likely three or four letters. */
+    private String extension;
+    /** The command string, which may include %1 which should be replaced with the target files name. */
+    private String command;
+    public FileAssociation(String extension, String command) {
+    this.command = command;
+    this.extension = extension;
+    }
+    /** Retrieve the command from this association.
+     * @return The command as a <strong>String</strong>.
+     */
+    public String getCommand() {
+    return command;
+    }
+    /** Retrieve the extension from this association.
+     * @return The extension as a <strong>String</strong>.
+     */
+    public String getExtension() {
+    return extension;
+    }
+    /** Set the command for this file association.
+     * @param command The new command as a <strong>String</strong>.
+     */
+    public void setCommand(String command) {
+    this.command = command;
+    }
+}

trunk/gli/src/org/greenstone/gatherer/file/FileAssociationManager.java

-              r4293
+              r4366
 /** Provides a manager for relating a filetype to a command to open that filetype, and an optional icon. Under windows this will attempt to leverage the Windows Registry. If this fails, or under other platforms, the user will be prompted to enter the required details manually. This information will then be stored for any further sessions of the Gatherer. Of course the ability to edit these settings must also be provided. */
 public class FileAssociationManager
      extends HashMap {
+    extends HashMap {
      static private final File ASSOC_FILE = new File(Utility.BASE_DIR, "associations.xml");
+    static private final File ASSOC_FILE = new File(Utility.BASE_DIR, "associations.xml");
      public FileAssociationManager() {
           // Attempt to load any previous file associations
           if(ASSOC_FILE.exists()) {
                 load();
+          }
+     }
+    public FileAssociationManager() {
+    // Attempt to load any previous file associations
+    if(ASSOC_FILE.exists()) {
+        load();
+    }
+    }
      public void destroy() {
           save();
+     }
+    public void destroy() {
+    save();
+    }
      public String getCommand(File file) {
           String command = null;
           String filename = file.toString();
           // Determine extension
           int index = -1;
           if((index = filename.lastIndexOf(".")) != -1) {
                 String extension = filename.substring(index + 1);
                 command = getCommand(file, extension);
+          }
           return command;
+     }
+    public String getCommand(File file) {
+    String command = null;
+    String filename = file.toString();
+    // Determine extension
+    int index = -1;
+    if((index = filename.lastIndexOf(".")) != -1) {
+        String extension = filename.substring(index + 1);
+        command = getCommand(file, extension);
+    }
+    return command;
+    }
      public String getCommand(File file, String extension) {
           // We first check to see if we already know the answer to how to run this program.
           String command = (String) get(extension);
           if(command != null) {
                 command = command + " " + file.getAbsolutePath();
+          }
           // If not, and we are on windows, try the registry.
           if(command == null && Utility.isWindows()) {
                 command = WinRegistry.openCommand(file.getAbsolutePath());
+          }
           // Failing all that prompt the user to select the program to open this with.
           if(command == null) {
                 FileAssociationDialog dialog = new FileAssociationDialog(this);
                 command = dialog.display(extension);
                 dialog.destroy();
                 dialog = null;
                 if(command != null) {
                      put(extension, command);
                      command = command + " " + file.getAbsolutePath();
+                }
+          }
           ///ystem.err.println("Get command: " + extension + " = " + command);
           return command;
+     }
+    public String getCommand(File file, String extension) {
+    // We first check to see if we already know the answer to how to run this program.
+    String command = (String) get(extension);
+    if(command != null) {
+        command = command + " " + file.getAbsolutePath();
+    }
+    // If not, and we are on windows, try the registry.
+    if(command == null && Utility.isWindows()) {
+        command = WinRegistry.openCommand(file.getAbsolutePath());
+    }
+    // Failing all that prompt the user to select the program to open this with.
+    if(command == null) {
+        FileAssociationDialog dialog = new FileAssociationDialog(this);
+        command = dialog.display(extension);
+        dialog.destroy();
+        dialog = null;
+        if(command != null) {
+        put(extension, command);
+        command = command + " " + file.getAbsolutePath();
+        }
+    }
+    ///ystem.err.println("Get command: " + extension + " = " + command);
+    return command;
+    }
      public String getCommandImmediately(String extension) {
           return (String) get(extension);
+     }
+    public String getCommandImmediately(String extension) {
+    return (String) get(extension);
+    }
      public void edit() {
           FileAssociationDialog dialog = new FileAssociationDialog(this);
           dialog.display(null);
           dialog.destroy();
           dialog = null;
+     }
+    public void edit() {
+    FileAssociationDialog dialog = new FileAssociationDialog(this);
+    dialog.display(null);
+    dialog.destroy();
+    dialog = null;
+    }
      private void load() {
           // Read in and parse the document.
           Document document = Utility.parse(ASSOC_FILE, false);
           if(document != null) {
+    private void load() {
+    // Read in and parse the document.
+    Document document = Utility.parse(ASSOC_FILE, false);
+    if(document != null) {
                 // Recover all the entry nodes of the association root.
                 for(Node entry_n = document.getDocumentElement().getFirstChild(); entry_n != null; entry_n = entry_n.getNextSibling()) {
                      if(entry_n.getNodeName().equals("Entry")) {
                           Element entry_e = (Element) entry_n;
                           String extension = entry_e.getAttribute("extension");
                           String command = MSMUtils.getValue(entry_e);
                           put(extension, command);
                           extension = null;
                           command = null;
                           entry_e = null;
+                     }
+                }
+          }
+     }
+        for(Node entry_n = document.getDocumentElement().getFirstChild(); entry_n != null; entry_n = entry_n.getNextSibling()) {
+        if(entry_n.getNodeName().equals("Entry")) {
+            Element entry_e = (Element) entry_n;
+            String extension = entry_e.getAttribute("extension");
+            String command = MSMUtils.getValue(entry_e);
+            put(extension, command);
+            extension = null;
+            command = null;
+            entry_e = null;
+        }
+        }
+    }
+    }
      private void save() {
           // Only save if there is something to save.
           if(size() > 0) {
                 StringBuffer assoc = new StringBuffer("<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n");
                 assoc.append("<!DOCTYPE Associations [\n");
                 assoc.append("  <!ELEMENT Associations (Entry*)>\n");
                 assoc.append("  <!ELEMENT Entry (#PCDATA)>\n");
                 assoc.append("  <!ATTLIST Entry\n");
                 assoc.append("            extension CDATA #REQUIRED>\n");
                 assoc.append("]>\n");
                 assoc.append("\n");
                 assoc.append("<Associations>\n");
                 for(Iterator keys = keySet().iterator(); keys.hasNext(); ) {
                      String extension = (String) keys.next();
                      String command = (String) get(extension);
                      assoc.append("\t<Entry extension=\"");
                      assoc.append(extension);
                      assoc.append("\">");
                      assoc.append(command);
                      assoc.append("</Entry>\n");
+                }
                 assoc.append("</Associations>");
+    private void save() {
+    // Only save if there is something to save.
+    if(size() > 0) {
+        StringBuffer assoc = new StringBuffer("<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n");
+        assoc.append("<!DOCTYPE Associations [\n");
+        assoc.append("  <!ELEMENT Associations (Entry*)>\n");
+        assoc.append("  <!ELEMENT Entry (#PCDATA)>\n");
+        assoc.append("  <!ATTLIST Entry\n");
+        assoc.append("            extension CDATA #REQUIRED>\n");
+        assoc.append("]>\n");
+        assoc.append("\n");
+        assoc.append("<Associations>\n");
+        for(Iterator keys = keySet().iterator(); keys.hasNext(); ) {
+        String extension = (String) keys.next();
+        String command = (String) get(extension);
+        assoc.append("\t<Entry extension=\"");
+        assoc.append(extension);
+        assoc.append("\">");
+        assoc.append(command);
+        assoc.append("</Entry>\n");
+        }
+        assoc.append("</Associations>");
                 String assoc_str = assoc.toString();
                 assoc = null;
                 try {
                      FileOutputStream fos = new FileOutputStream(ASSOC_FILE);
                      OutputStreamWriter osw = new OutputStreamWriter(fos, Charset.forName("UTF-8"));
                      int position = 0;
                      int BLOCK_SIZE = 1024;
                      // Write x block sized chunks to file.
                      while(position + BLOCK_SIZE < assoc_str.length()) {
                           osw.write(assoc_str, position, BLOCK_SIZE);
                           position = position + BLOCK_SIZE;
+                     }
                      // Write the remainder of the buffer.
                      if(position < assoc_str.length()) {
                           osw.write(assoc_str, position, assoc_str.length() - position);
+                     }
                      osw.flush();
                      osw.close();
                      osw = null;
                      fos.close();
                      fos = null;
                      assoc_str = null;
+                }
                 catch (Exception error) {
                      Gatherer.printStackTrace(error);
+                }
+          }
+     }
+        String assoc_str = assoc.toString();
+        assoc = null;
+        try {
+        FileOutputStream fos = new FileOutputStream(ASSOC_FILE);
+        OutputStreamWriter osw = new OutputStreamWriter(fos, Charset.forName("UTF-8"));
+        int position = 0;
+        int BLOCK_SIZE = 1024;
+        // Write x block sized chunks to file.
+        while(position + BLOCK_SIZE < assoc_str.length()) {
+            osw.write(assoc_str, position, BLOCK_SIZE);
+            position = position + BLOCK_SIZE;
+        }
+        // Write the remainder of the buffer.
+        if(position < assoc_str.length()) {
+            osw.write(assoc_str, position, assoc_str.length() - position);
+        }
+        osw.flush();
+        osw.close();
+        osw = null;
+        fos.close();
+        fos = null;
+        assoc_str = null;
+        }
+        catch (Exception error) {
+        Gatherer.printStackTrace(error);
+        }
+    }
+    }
      public void setCommand(String extension, String command) {
           ///ystem.err.println("Set command: " + extension + " = " + command);
           if(command == null || command.length() == 0) {
                 remove(extension);
+          }
           else {
                 put(extension, command);
+          }
+     }
+    public void setCommand(String extension, String command) {
+    ///ystem.err.println("Set command: " + extension + " = " + command);
+    if(command == null || command.length() == 0) {
+        remove(extension);
+    }
+    else {
+        put(extension, command);
+    }
+    }
+}

trunk/gli/src/org/greenstone/gatherer/file/FileFilter.java

-              r4293
+              r4366
 public class FileFilter {
      public boolean exclude;
      public String filter;
      public FileFilter(String filter, boolean exclude) {
           this.exclude = exclude;
           this.filter = filter;
+     }
+    public boolean exclude;
+    public String filter;
+    public FileFilter(String filter, boolean exclude) {
+    this.exclude = exclude;
+    this.filter = filter;
+    }
+}

trunk/gli/src/org/greenstone/gatherer/file/FileJob.java

-              r4293
+              r4366
  */
 public class FileJob {
      /** true to mark that this file has already been copied, false otherwise. */
      public boolean done = false;
+    /** true to mark that this file has already been copied, false otherwise. */
+    public boolean done = false;
      public boolean folder_level = false;
      /** true if this should generate an undo event, false for a redo one. */
      public boolean undo = true;
      /** true if this job should generate an undo event of any kind. */
      public boolean undoable = false;
      /** The type of this movement as an byte. */
      public byte type = 0;
      /** The DragComponent source of this file, most likely a GTree. */
      public DragComponent source       = null;
      /** The DragComponent to move the file to, again most likely a GTree. */
      public DragComponent target       = null;
      /** The unique identifier shared by all jobs created by the same action. */
      private long id = 0;
      /** The path to the destination node as a string. Used because any reference based path or variables quickly becomes obsolete. */
      private TreePath destination_path = null;
      /** The path to the origin node as a string. Used because any reference based path or variables quickly becomes obsolete. */
      private TreePath origin_path = null;
      /** An element of the job type enumeration indicating a copy action. */
      static final public byte COPY   = 1;
      /** An element of the job type enumeration indicating a delete action. */
      static final public byte DELETE = 2;
      /** An element of the job type enumeration indicating a move action. */
      static final public byte MOVE   = 3;
      /** Constructor.
       * @param id A unique identifier for this job (and others created with a single gesture) as a long.
       * @param source The DragComponent source of this file, most likely a GTree.
       * @param orig The FileNode you wish to mode.
       * @param target The DragComponent to move the file to, again most likely a GTree.
       * @param dest The files new FileNode parent within the target.
       * @param type The type of this movement as an int, either COPY or DELETE.
       * @param undo true if this job some create an undo job when actioned, false for a redo job.
       * @param undoable true if this job can generate undo or redo jobs, false otherwise.
       */
      public FileJob(long id, DragComponent source, FileNode orig, DragComponent target, FileNode dest, byte type, boolean undo, boolean undoable) {
           this.id = id;
           this.source = source;
           this.target = target;
           this.type = type;
           this.undo = undo;
           this.undoable = undoable;
           ///ystem.err.println("New Job: " + type + ", " + source + ", " + target);
           // Dont store FileNodes which can go stale. Store paths instead, which are used to locate current 'fresh' versions of nodes.
           if(dest != null) {
                 this.destination_path = new TreePath(dest.getPath());
+    public boolean folder_level = false;
+    /** true if this should generate an undo event, false for a redo one. */
+    public boolean undo = true;
+    /** true if this job should generate an undo event of any kind. */
+    public boolean undoable = false;
+    /** The type of this movement as an byte. */
+    public byte type = 0;
+    /** The DragComponent source of this file, most likely a GTree. */
+    public DragComponent source       = null;
+    /** The DragComponent to move the file to, again most likely a GTree. */
+    public DragComponent target       = null;
+    /** The unique identifier shared by all jobs created by the same action. */
+    private long id = 0;
+    /** The path to the destination node as a string. Used because any reference based path or variables quickly becomes obsolete. */
+    private TreePath destination_path = null;
+    /** The path to the origin node as a string. Used because any reference based path or variables quickly becomes obsolete. */
+    private TreePath origin_path = null;
+    /** An element of the job type enumeration indicating a copy action. */
+    static final public byte COPY   = 1;
+    /** An element of the job type enumeration indicating a delete action. */
+    static final public byte DELETE = 2;
+    /** An element of the job type enumeration indicating a move action. */
+    static final public byte MOVE   = 3;
+    /** Constructor.
+     * @param id A unique identifier for this job (and others created with a single gesture) as a long.
+     * @param source The DragComponent source of this file, most likely a GTree.
+     * @param orig The FileNode you wish to mode.
+     * @param target The DragComponent to move the file to, again most likely a GTree.
+     * @param dest The files new FileNode parent within the target.
+     * @param type The type of this movement as an int, either COPY or DELETE.
+     * @param undo true if this job some create an undo job when actioned, false for a redo job.
+     * @param undoable true if this job can generate undo or redo jobs, false otherwise.
+     */
+    public FileJob(long id, DragComponent source, FileNode orig, DragComponent target, FileNode dest, byte type, boolean undo, boolean undoable) {
+    this.id = id;
+    this.source = source;
+    this.target = target;
+    this.type = type;
+    this.undo = undo;
+    this.undoable = undoable;
+    ///ystem.err.println("New Job: " + type + ", " + source + ", " + target);
+    // Dont store FileNodes which can go stale. Store paths instead, which are used to locate current 'fresh' versions of nodes.
+    if(dest != null) {
+        this.destination_path = new TreePath(dest.getPath());
                 ///ystem.err.println("Destination Path: " + destination_path);
+          }
           if(orig != null) {
                 this.origin_path = new TreePath(orig.getPath());
+    }
+    if(orig != null) {
+        this.origin_path = new TreePath(orig.getPath());
                 ///ystem.err.println("Origin Path: " + origin_path);
+          }
+     }
      /** Retrieve the destination node. Watch out for stale versions by always attempting to load the node at destination_path first. */
      public FileNode getDestination() {
           FileNode destination = null;
           if(destination_path != null) {
                 if(target != null) {
                      FileSystemModel model = (FileSystemModel)target.getTreeModel();
                      destination = model.getNode(destination_path);
+                }
+    }
+    }
+    /** Retrieve the destination node. Watch out for stale versions by always attempting to load the node at destination_path first. */
+    public FileNode getDestination() {
+    FileNode destination = null;
+    if(destination_path != null) {
+        if(target != null) {
+        FileSystemModel model = (FileSystemModel)target.getTreeModel();
+        destination = model.getNode(destination_path);
+        }
                 // If the above fails, a stale copy may be better than nothing.
                 else {
                      destination = (FileNode) destination_path.getLastPathComponent();
+                }
+          }
           return destination;
+     }
      /** Retrieve the origin node. Watch out for stale versions by always attempting to load the node at origin_path first. */
      public FileNode getOrigin() {
           FileNode origin = null;
           if(origin_path != null) {
                 if(source != null) {
                      FileSystemModel model = (FileSystemModel)source.getTreeModel();
                      origin = model.getNode(origin_path);
+                }
+        else {
+        destination = (FileNode) destination_path.getLastPathComponent();
+        }
+    }
+    return destination;
+    }
+    /** Retrieve the origin node. Watch out for stale versions by always attempting to load the node at origin_path first. */
+    public FileNode getOrigin() {
+    FileNode origin = null;
+    if(origin_path != null) {
+        if(source != null) {
+        FileSystemModel model = (FileSystemModel)source.getTreeModel();
+        origin = model.getNode(origin_path);
+        }
                 // If the above fails, a stale copy may be better than nothing.
                 else {
                      origin = (FileNode) origin_path.getLastPathComponent();
+                }
+          }
           return origin;
+     }
      /** Retrieve the id for this job. */
      public long ID() {
           return id;
+     }
+        else {
+        origin = (FileNode) origin_path.getLastPathComponent();
+        }
+    }
+    return origin;
+    }
+    /** Retrieve the id for this job. */
+    public long ID() {
+    return id;
+    }
      public String toString() {
           StringBuffer text = new StringBuffer("");
           switch(type) {
           case COPY:
                 text.append("copy ");
                 break;
           case DELETE:
                 text.append("delete ");
                 break;
           case MOVE:
                 text.append("move ");
                 break;
           default:
                 text.append("unknown ");
+          }
           FileNode origin = getOrigin();
           if(origin != null) {
                 text.append(origin.getFile().getAbsolutePath());
+          }
           else {
                 text.append("ERROR!");
+          }
           text.append(" -> ");
           FileNode destination = getDestination();
           if(destination != null) {
                 text.append(destination.getFile().getAbsolutePath());
+          }
           else {
                 text.append("Recycle Bin");
+          }
           return text.toString();
+     }
+    public String toString() {
+    StringBuffer text = new StringBuffer("");
+    switch(type) {
+    case COPY:
+        text.append("copy ");
+        break;
+    case DELETE:
+        text.append("delete ");
+        break;
+    case MOVE:
+        text.append("move ");
+        break;
+    default:
+        text.append("unknown ");
+    }
+    FileNode origin = getOrigin();
+    if(origin != null) {
+        text.append(origin.getFile().getAbsolutePath());
+    }
+    else {
+        text.append("ERROR!");
+    }
+    text.append(" -> ");
+    FileNode destination = getDestination();
+    if(destination != null) {
+        text.append(destination.getFile().getAbsolutePath());
+    }
+    else {
+        text.append("Recycle Bin");
+    }
+    return text.toString();
+    }
+}

trunk/gli/src/org/greenstone/gatherer/file/FileManager.java

-              r4293
+              r4366
  */
 public class FileManager {
      /** Not only the queue of files to be moved, but also the object that moves them. */
      private FileQueue queue = null;
      /** Constructor.
       * @see org.greenstone.gatherer.file.FileQueue
       */
      public FileManager() {
           queue = new FileQueue(false);
           queue.start();
+     }
+    /** Not only the queue of files to be moved, but also the object that moves them. */
+    private FileQueue queue = null;
+    /** Constructor.
+     * @see org.greenstone.gatherer.file.FileQueue
+     */
+    public FileManager() {
+    queue = new FileQueue(false);
+    queue.start();
+    }
      /** Given the arguments, determine what action should be carried out by the file queue, and add all of the necessary file jobs. */
      public void action(DragComponent source, FileNode[] source_nodes, DragComponent target, FileNode target_node) {
           byte type = 0;
           // If source and target are the same we are moving
           if(source == target) {
                 type = FileJob.MOVE;
+          }
           // If source and target are different
           else {
+    /** Given the arguments, determine what action should be carried out by the file queue, and add all of the necessary file jobs. */
+    public void action(DragComponent source, FileNode[] source_nodes, DragComponent target, FileNode target_node) {
+    byte type = 0;
+    // If source and target are the same we are moving
+    if(source == target) {
+        type = FileJob.MOVE;
+    }
+    // If source and target are different
+    else {
                 // If target is the UndoManager, we're deleting
                 if(target instanceof UndoManager) {
                      // If the source is the workspace then display an error message. Workspace is read only.
                      if(source.toString().equals("Workspace")) {
                           JOptionPane.showMessageDialog(Gatherer.g_man, Gatherer.dictionary.get("FileActions.Read_Only"), Gatherer.dictionary.get("General.Error"), JOptionPane.ERROR_MESSAGE);
                           return;
+                     }
                      // Normal delete. Go ahead.
                      else {
                           type = FileJob.DELETE;
+                     }
+                }
+        if(target instanceof UndoManager) {
+        // If the source is the workspace then display an error message. Workspace is read only.
+        if(source.toString().equals("Workspace")) {
+            JOptionPane.showMessageDialog(Gatherer.g_man, Gatherer.dictionary.get("FileActions.Read_Only"), Gatherer.dictionary.get("General.Error"), JOptionPane.ERROR_MESSAGE);
+            return;
+        }
+        // Normal delete. Go ahead.
+        else {
+            type = FileJob.DELETE;
+        }
+        }
                 // Otherwise we are copying
                 else {
                      type = FileJob.COPY;
+                }
+          }
           Task task = new Task(System.currentTimeMillis(), source, source_nodes, target, target_node, type);
           SwingUtilities.invokeLater(task);
+     }
+        else {
+        type = FileJob.COPY;
+        }
+    }
+    Task task = new Task(System.currentTimeMillis(), source, source_nodes, target, target_node, type);
+    SwingUtilities.invokeLater(task);
+    }
      /** Retrieves the file queue object. */
      public FileQueue getQueue() {
           return queue;
+     }
+    /** Retrieves the file queue object. */
+    public FileQueue getQueue() {
+    return queue;
+    }
      public void newFolder(DragTree tree, FileNode parent_node) {
           // Ask the user for the directories name.
           NewFolderPrompt new_folder_prompt = new NewFolderPrompt(parent_node);
           String name = new_folder_prompt.display();
           new_folder_prompt.dispose();
           new_folder_prompt = null;
           // And if the name is non-null...
           if(name != null) {
                 FileSystemModel model = (FileSystemModel) tree.getModel();
                 File folder_file = new File(parent_node.getFile(), name);
+    public void newFolder(DragTree tree, FileNode parent_node) {
+    // Ask the user for the directories name.
+    NewFolderPrompt new_folder_prompt = new NewFolderPrompt(parent_node);
+    String name = new_folder_prompt.display();
+    new_folder_prompt.dispose();
+    new_folder_prompt = null;
+    // And if the name is non-null...
+    if(name != null) {
+        FileSystemModel model = (FileSystemModel) tree.getModel();
+        File folder_file = new File(parent_node.getFile(), name);
                 //... check if it already exists.
                 if(folder_file.exists()) {
                      JOptionPane.showMessageDialog(Gatherer.g_man, Gatherer.dictionary.get("FileActions.Folder_Already_Exists", name), Gatherer.dictionary.get("General.Error"), JOptionPane.ERROR_MESSAGE);
+                }
+        if(folder_file.exists()) {
+        JOptionPane.showMessageDialog(Gatherer.g_man, Gatherer.dictionary.get("FileActions.Folder_Already_Exists", name), Gatherer.dictionary.get("General.Error"), JOptionPane.ERROR_MESSAGE);
+        }
                 // Otherwise create it.
                 else {
                      folder_file.mkdirs();
                      FileNode folder_node = new FileNode(folder_file);
                      SynchronizedTreeModelTools.insertNodeInto(model, parent_node, folder_node);
                      folder_node = null;
+                }
                 folder_file = null;
                 model = null;
+          }
           name = null;
+     }
+        else {
+        folder_file.mkdirs();
+        FileNode folder_node = new FileNode(folder_file);
+        SynchronizedTreeModelTools.insertNodeInto(model, parent_node, folder_node);
+        folder_node = null;
+        }
+        folder_file = null;
+        model = null;
+    }
+    name = null;
+    }
      private class Task
           implements Runnable {
           private byte type;
           private DragComponent source;
           private DragComponent target;
           private FileNode target_node;
           private FileNode[] source_nodes;
           private long id;
           public Task(long id, DragComponent source, FileNode[] source_nodes, DragComponent target, FileNode target_node, byte type) {
                 this.id = id;
                 this.source = source;
                 this.source_nodes = source_nodes;
                 this.target = target;
                 this.target_node = target_node;
                 this.type = type;
+          }
           public void run() {
+    private class Task
+    implements Runnable {
+    private byte type;
+    private DragComponent source;
+    private DragComponent target;
+    private FileNode target_node;
+    private FileNode[] source_nodes;
+    private long id;
+    public Task(long id, DragComponent source, FileNode[] source_nodes, DragComponent target, FileNode target_node, byte type) {
+        this.id = id;
+        this.source = source;
+        this.source_nodes = source_nodes;
+        this.target = target;
+        this.target_node = target_node;
+        this.type = type;
+    }
+    public void run() {
                 // Reset, and calculate progress bar size.
                 queue.calculateSize(source_nodes);
+        queue.calculateSize(source_nodes);
                 // Now we queue the job(s). Note that this may fail if a read only file is encountered and we have been asked to delete.
                 for(int i = 0; source_nodes != null && i < source_nodes.length; i++) {
                      queue.addJob(id, source, source_nodes[i], target, target_node, type, true, true, true);
+                }
+          }
+     }
+        for(int i = 0; source_nodes != null && i < source_nodes.length; i++) {
+        queue.addJob(id, source, source_nodes[i], target, target_node, type, true, true, true);
+        }
+    }
+    }
+}

trunk/gli/src/org/greenstone/gatherer/file/FileNode.java

-              r4293
+              r4366
 public class FileNode
      implements MutableTreeNode {
      static final private int FALSE   = 0;
      static final private int TRUE    = 1;
      static final private int UNKNOWN = 2;
      private ArrayList children;
      private boolean children_readonly = true;
      private boolean readonly = true;
      private File file;
      private FileSystemModel model;
      private int allows_children = UNKNOWN;
      private MutableTreeNode parent;
      private String title;
      public FileNode(File file) {
           ///ystem.err.println("New FileNode(" + file.getAbsolutePath() + ")");
           this.file = file;
+     }
      public FileNode(File file, boolean readonly) {
           this(file);
           this.children_readonly = readonly;
           this.readonly = readonly;
+     }
      public FileNode(File file, FileSystemModel model) {
           this(file);
           this.model = model;
+     }
      public FileNode(File file, FileSystemModel model, boolean readonly) {
           this(file, readonly);
           this.model = model;
+     }
      public FileNode(File file, FileSystemModel model, String title) {
           this(file, model);
           this.title = title;
+     }
      public FileNode(File file, String title) {
           this(file);
           this.title = title;
+     }
      public FileNode(File file, String title, boolean readonly) {
           this(file, readonly);
           this.title = title;
+     }
      public FileNode(File file, FileSystemModel model, String title, boolean readonly) {
           this(file, model, readonly);
           this.title = title;
+     }
      /** The special 'dummy' root node, that is not based on a particular file, but instead holds several special directory mappings. */
      public FileNode(String title) {
           this.children = new ArrayList();
           this.title = title;
+     }
      /** Returns the children of the receiver as an Enumeration. */
      public Enumeration children() {
           return new FileEnumeration();
+     }
+    implements MutableTreeNode {
+    static final private int FALSE   = 0;
+    static final private int TRUE    = 1;
+    static final private int UNKNOWN = 2;
+    private ArrayList children;
+    private boolean children_readonly = true;
+    private boolean readonly = true;
+    private File file;
+    private FileSystemModel model;
+    private int allows_children = UNKNOWN;
+    private MutableTreeNode parent;
+    private String title;
+    public FileNode(File file) {
+    ///ystem.err.println("New FileNode(" + file.getAbsolutePath() + ")");
+    this.file = file;
+    }
+    public FileNode(File file, boolean readonly) {
+    this(file);
+    this.children_readonly = readonly;
+    this.readonly = readonly;
+    }
+    public FileNode(File file, FileSystemModel model) {
+    this(file);
+    this.model = model;
+    }
+    public FileNode(File file, FileSystemModel model, boolean readonly) {
+    this(file, readonly);
+    this.model = model;
+    }
+    public FileNode(File file, FileSystemModel model, String title) {
+    this(file, model);
+    this.title = title;
+    }
+    public FileNode(File file, String title) {
+    this(file);
+    this.title = title;
+    }
+    public FileNode(File file, String title, boolean readonly) {
+    this(file, readonly);
+    this.title = title;
+    }
+    public FileNode(File file, FileSystemModel model, String title, boolean readonly) {
+    this(file, model, readonly);
+    this.title = title;
+    }
+    /** The special 'dummy' root node, that is not based on a particular file, but instead holds several special directory mappings. */
+    public FileNode(String title) {
+    this.children = new ArrayList();
+    this.title = title;
+    }
+    /** Returns the children of the receiver as an Enumeration. */
+    public Enumeration children() {
+    return new FileEnumeration();
+    }
     /** Compare two filenodes for equality. */
     public boolean equals(FileNode node) {
           boolean result = false;
           if(node != null) {
                 if(file != null) {
                      result = (file.equals(node.getFile()));
+                }
                 else {
                      result = toString().equals(node.toString());
+                }
+          }
           return result;
+    boolean result = false;
+    if(node != null) {
+        if(file != null) {
+        result = (file.equals(node.getFile()));
+        }
+        else {
+        result = toString().equals(node.toString());
+        }
+    }
+    return result;
+    }
     /** Returns true if the receiver allows children. We have to cache the result of this call to prevent unceasing missing disk messages being thrown if the removable media was, um, removed after directory mapped. */
     public boolean getAllowsChildren() {
           if(readonly) {
                 if(allows_children == UNKNOWN) {
                      // If the file is non-null but doesn't exist (as is the case for removable media), return true anyway.
                      if(file != null) {
                           if(FileSystemView.getFileSystemView().isFileSystemRoot(file)) {
                                 allows_children = TRUE;
+                          }
                           else if(file.exists() && file.isDirectory()) {
                                 allows_children = TRUE;
+                          }
                           // Any mapped directories always allow children.
                           else if(getParent() != null && getParent().getParent() == null) {
                                 allows_children = TRUE;
+                          }
                           else {
                                 allows_children = FALSE;
+                          }
+                     }
                      // Allows children is always true for dummy nodes.
                      else {
                           allows_children = TRUE;
+                     }
+                }
                 return (allows_children == TRUE);
+          }
           else {
                 return (file == null || file.isDirectory());
+          }
+    if(readonly) {
+        if(allows_children == UNKNOWN) {
+        // If the file is non-null but doesn't exist (as is the case for removable media), return true anyway.
+        if(file != null) {
+            if(FileSystemView.getFileSystemView().isFileSystemRoot(file)) {
+            allows_children = TRUE;
+            }
+            else if(file.exists() && file.isDirectory()) {
+            allows_children = TRUE;
+            }
+            // Any mapped directories always allow children.
+            else if(getParent() != null && getParent().getParent() == null) {
+            allows_children = TRUE;
+            }
+            else {
+            allows_children = FALSE;
+            }
+        }
+        // Allows children is always true for dummy nodes.
+        else {
+            allows_children = TRUE;
+        }
+        }
+        return (allows_children == TRUE);
+    }
+    else {
+        return (file == null || file.isDirectory());
+    }
+    }
      /** Returns the child TreeNode at index childIndex. */
      public TreeNode getChildAt(int index) {
           TreeNode result = null;
           map();
           if(0 <= index && index < children.size()) {
                 result = (TreeNode) children.get(index);
+          }
           else {
                 result = new DefaultMutableTreeNode("Error");
+          }
           return result;
+     }
      /** Returns the number of children TreeNodes the receiver contains. */
      public int getChildCount() {
           int size = 0;
           // We don't automatically map if this is a system root, or we risk the 50,000 Disk not found error messages of death.
           if(FileSystemView.getFileSystemView().isFileSystemRoot(file)) {
               size = 1; // Size is always non-zero for a system root
+          }
           else {
               map();
+          }
           ///ystem.err.println(this + ".getChildCount() = " + children.size());
           if(children != null) {
                 size = children.size();
+          }
           return size;
+     }
      public File getFile() {
           return file;
+     }
      /** Returns the index of node in the receivers children. */
      public int getIndex(TreeNode node) {
           map();
           return children.indexOf(node);
+     }
      /** Returns the parent TreeNode of the receiver. */
      public TreeNode getParent() {
           return parent;
+     }
      /** Retrieves the tree path from the root node to this node. */
      public TreeNode[] getPath() {
           int count = 0;
           TreeNode current = this;
           while(current != null) {
                 count++;
                 current = current.getParent();
+          }
           TreeNode[] path = new TreeNode[count];
           current = this;
           while(current != null) {
                 path[count - 1] = current;
                 count--;
                 current = current.getParent();
+          }
           return path;
+     }
      public void insert(MutableTreeNode child) {
           insert(child, children.size());
+     }
      /** Adds child to the receiver at index. */
      public void insert(MutableTreeNode child, int index) {
           ///ystem.err.println("Insert " + child + " in " + this + " at index " + index);
           //map();
           try {
                 children.add(index, child);
+    /** Returns the child TreeNode at index childIndex. */
+    public TreeNode getChildAt(int index) {
+    TreeNode result = null;
+    map();
+    if(0 <= index && index < children.size()) {
+        result = (TreeNode) children.get(index);
+    }
+    else {
+        result = new DefaultMutableTreeNode("Error");
+    }
+    return result;
+    }
+    /** Returns the number of children TreeNodes the receiver contains. */
+    public int getChildCount() {
+    int size = 0;
+    // We don't automatically map if this is a system root, or we risk the 50,000 Disk not found error messages of death.
+    if(FileSystemView.getFileSystemView().isFileSystemRoot(file)) {
+        size = 1; // Size is always non-zero for a system root
+    }
+    else {
+        map();
+    }
+    ///ystem.err.println(this + ".getChildCount() = " + children.size());
+    if(children != null) {
+        size = children.size();
+    }
+    return size;
+    }
+    public File getFile() {
+    return file;
+    }
+    /** Returns the index of node in the receivers children. */
+    public int getIndex(TreeNode node) {
+    map();
+    return children.indexOf(node);
+    }
+    /** Returns the parent TreeNode of the receiver. */
+    public TreeNode getParent() {
+    return parent;
+    }
+    /** Retrieves the tree path from the root node to this node. */
+    public TreeNode[] getPath() {
+    int count = 0;
+    TreeNode current = this;
+    while(current != null) {
+        count++;
+        current = current.getParent();
+    }
+    TreeNode[] path = new TreeNode[count];
+    current = this;
+    while(current != null) {
+        path[count - 1] = current;
+        count--;
+        current = current.getParent();
+    }
+    return path;
+    }
+    public void insert(MutableTreeNode child) {
+    insert(child, children.size());
+    }
+    /** Adds child to the receiver at index. */
+    public void insert(MutableTreeNode child, int index) {
+    ///ystem.err.println("Insert " + child + " in " + this + " at index " + index);
+    //map();
+    try {
+        children.add(index, child);
                 // Set parent and model.
                 FileNode new_child = (FileNode) child;
                 new_child.setModel(model);
                 new_child.setParent(this);
                 new_child.setReadOnly(readonly);
+          }
           catch(Exception error) {
                 error.printStackTrace();
+          }
+     }
      /** Returns true if the receiver is a leaf. */
      public boolean isLeaf() {
           return !getAllowsChildren();
+     }
      public boolean isReadOnly() {
           return readonly;
+     }
      public void map() {
           // Only map if there are no children.
           if(children == null && file != null && getAllowsChildren()) {
+        FileNode new_child = (FileNode) child;
+        new_child.setModel(model);
+        new_child.setParent(this);
+        new_child.setReadOnly(readonly);
+    }
+    catch(Exception error) {
+        error.printStackTrace();
+    }
+    }
+    /** Returns true if the receiver is a leaf. */
+    public boolean isLeaf() {
+    return !getAllowsChildren();
+    }
+    public boolean isReadOnly() {
+    return readonly;
+    }
+    public void map() {
+    // Only map if there are no children.
+    if(children == null && file != null && getAllowsChildren()) {
                 ///ystem.err.println("Map: " + this);
                 children = new ArrayList();
                 File[] files = file.listFiles();
                 if(files != null && files.length > 0) {
                      ArrayTools tools = new ArrayTools();
                      // Apply the filters set in the model.
                      FileFilter[] filters = model.getFilters();
                      for(int i = 0; filters != null && i < filters.length; i++) {
                           files = tools.filter(files, filters[i].filter, filters[i].exclude);
+                     }
                      // Sort the remaining files.
                      tools.sort(files, true);
                      // Now add them to children.
                      for(int i = 0; i < files.length; i++) {
                           FileNode child = new FileNode(files[i], model, children_readonly);
                           child.setParent(this);
                           children.add(child);
+                     }
+                }
                 model.nodeStructureChanged(this);
+          }
           else {
               ///ystem.err.println("Can't map: " + this + ". No file or doesn't allow children.");
+          }
+     }
      /** Removes the child at index from the receiver. */
      public void remove(int index) {
           if(0 <= index && index < children.size()) {
                 children.remove(index);
+          }
+     }
      /** Removes node from the receiver. */
      public void remove(MutableTreeNode node){
           int index = getIndex(node);
           if(index != -1) {
                 children.remove(index);
+          }
+     }
      /** Removes the receiver from its parent. */
      public void removeFromParent() {
           parent.remove(this);
           parent = null;
+     }
      public void setChildrenReadOnly(boolean children_readonly) {
           this.children_readonly = children_readonly;
+     }
      public void setFile(File file) {
           this.file = file;
+     }
      public void setModel(FileSystemModel model) {
           this.model = model;
+     }
      public void setParent(MutableTreeNode parent) {
           this.parent = parent;
+     }
      public void setReadOnly(boolean readonly) {
           this.readonly = readonly;
+     }
      /** Resets the user object of the receiver to object. */
      public void setUserObject(Object object) {
           try {
                 file = (File) object;
                 title = null;
+          }
           catch(Exception error) {
                 error.printStackTrace();
+          }
+     }
      public String toString() {
           if(title == null) {
             if(FileSystemView.getFileSystemView().isFileSystemRoot(file)) {
               title = file.getAbsolutePath();
+            }
             else {
                 title = file.getName();
+            }
+          }
           return title;
+     }
      /** Unmap this nodes children. */
      public void unmap() {
           // You cannot unmap nodes that have no file basis.
           if(file != null) {
+        children = new ArrayList();
+        File[] files = file.listFiles();
+        if(files != null && files.length > 0) {
+        ArrayTools tools = new ArrayTools();
+        // Apply the filters set in the model.
+        FileFilter[] filters = model.getFilters();
+        for(int i = 0; filters != null && i < filters.length; i++) {
+            files = tools.filter(files, filters[i].filter, filters[i].exclude);
+        }
+        // Sort the remaining files.
+        tools.sort(files, true);
+        // Now add them to children.
+        for(int i = 0; i < files.length; i++) {
+            FileNode child = new FileNode(files[i], model, children_readonly);
+            child.setParent(this);
+            children.add(child);
+        }
+        }
+        model.nodeStructureChanged(this);
+    }
+    else {
+        ///ystem.err.println("Can't map: " + this + ". No file or doesn't allow children.");
+    }
+    }
+    /** Removes the child at index from the receiver. */
+    public void remove(int index) {
+    if(0 <= index && index < children.size()) {
+        children.remove(index);
+    }
+    }
+    /** Removes node from the receiver. */
+    public void remove(MutableTreeNode node){
+    int index = getIndex(node);
+    if(index != -1) {
+        children.remove(index);
+    }
+    }
+    /** Removes the receiver from its parent. */
+    public void removeFromParent() {
+    parent.remove(this);
+    parent = null;
+    }
+    public void setChildrenReadOnly(boolean children_readonly) {
+    this.children_readonly = children_readonly;
+    }
+    public void setFile(File file) {
+    this.file = file;
+    }
+    public void setModel(FileSystemModel model) {
+    this.model = model;
+    }
+    public void setParent(MutableTreeNode parent) {
+    this.parent = parent;
+    }
+    public void setReadOnly(boolean readonly) {
+    this.readonly = readonly;
+    }
+    /** Resets the user object of the receiver to object. */
+    public void setUserObject(Object object) {
+    try {
+        file = (File) object;
+        title = null;
+    }
+    catch(Exception error) {
+        error.printStackTrace();
+    }
+    }
+    public String toString() {
+    if(title == null) {
+        if(FileSystemView.getFileSystemView().isFileSystemRoot(file)) {
+        title = file.getAbsolutePath();
+        }
+        else {
+        title = file.getName();
+        }
+    }
+    return title;
+    }
+    /** Unmap this nodes children. */
+    public void unmap() {
+    // You cannot unmap nodes that have no file basis.
+    if(file != null) {
                 ///ystem.err.println("Unmap: " + this);
                 children = null;
+          }
           else {
+        children = null;
+    }
+    else {
                 ///ystem.err.println("No file for " + this + " - can't unmap.");
+          }
+     }
      private class FileEnumeration
           implements Enumeration {
           private int index = 0;
           /** Tests if this enumeration contains more elements. */
           public boolean hasMoreElements() {
                 return (index < children.size());
+          }
           /** Returns the next element of this enumeration if this enumeration object has at least one more element to provide. */
           public Object nextElement() {
                 Object result = null;
                 if(index < children.size()) {
                      result = children.get(index);
                      index++;
+                }
                 return result;
+          }
+     }
+    }
+    }
+    private class FileEnumeration
+    implements Enumeration {
+    private int index = 0;
+    /** Tests if this enumeration contains more elements. */
+    public boolean hasMoreElements() {
+        return (index < children.size());
+    }
+    /** Returns the next element of this enumeration if this enumeration object has at least one more element to provide. */
+    public Object nextElement() {
+        Object result = null;
+        if(index < children.size()) {
+        result = children.get(index);
+        index++;
+        }
+        return result;
+    }
+    }
+}

trunk/gli/src/org/greenstone/gatherer/file/FileOpenActionListener.java

-              r4293
+              r4366
  */
 public class FileOpenActionListener
      extends MouseAdapter
      implements TreeExpansionListener {
      /** This flag gets toggled to <i>true</i> if the listener determines that the next mouse clicked event it will recieve is actually caused by the tree expanding or collapsing. */
      private boolean ignore = false;
      /** The constructor. */
      public FileOpenActionListener() {
+     }
      /** Any subclass of MouseAdapter can override this method to respond to mouse click events. In this case we want to start an external application if someone double clicks on an appropriate file record.
+    extends MouseAdapter
+    implements TreeExpansionListener {
+    /** This flag gets toggled to <i>true</i> if the listener determines that the next mouse clicked event it will recieve is actually caused by the tree expanding or collapsing. */
+    private boolean ignore = false;
+    /** The constructor. */
+    public FileOpenActionListener() {
+    }
+    /** Any subclass of MouseAdapter can override this method to respond to mouse click events. In this case we want to start an external application if someone double clicks on an appropriate file record.
       * @param event A <strong>MouseEvent</strong> containing further information about the mouse click performed.
       * @see org.greenstone.gatherer.Gatherer
 …
       * @see org.greenstone.gatherer.tree.GTree
       */
      public void mouseClicked(MouseEvent event) {
           ///ystem.err.println("Mouse clicked");
           if(!ignore) {
                 if(event.getClickCount() >= 2) {
                      // Find the file we're clicking on.
                      JTree tree = (JTree)event.getSource();
                      TreePath path = tree.getClosestPathForLocation(event.getX(), event.getY());
                      if(path != null) {
                           FileNode record = (FileNode)path.getLastPathComponent();
                           ///ystem.err.println("Double clicked on " + record);
                           File file = record.getFile();
                           if(file != null && file.isFile()) {
                                 ///ystem.err.println("Running " + file);
                                 Gatherer.self.spawnApplication(file);
+                          }
+                     }
+                }
+          }
           else {
+    public void mouseClicked(MouseEvent event) {
+    ///ystem.err.println("Mouse clicked");
+    if(!ignore) {
+        if(event.getClickCount() >= 2) {
+        // Find the file we're clicking on.
+        JTree tree = (JTree)event.getSource();
+        TreePath path = tree.getClosestPathForLocation(event.getX(), event.getY());
+        if(path != null) {
+            FileNode record = (FileNode)path.getLastPathComponent();
+            ///ystem.err.println("Double clicked on " + record);
+            File file = record.getFile();
+            if(file != null && file.isFile()) {
+            ///ystem.err.println("Running " + file);
+            Gatherer.self.spawnApplication(file);
+            }
+        }
+        }
+    }
+    else {
                 ///ystem.err.println("Caused by tree expansion / collapse. Ignoring.");
                 ignore = false;
+          }
+     }
      /** Any implementation of TreeExpansionListener must include this method so that we can be informed when a tree node has been collapsed, thus indicating that any mouse click events about to be recieved are most likely related to this event.
+        ignore = false;
+    }
+    }
+    /** Any implementation of TreeExpansionListener must include this method so that we can be informed when a tree node has been collapsed, thus indicating that any mouse click events about to be recieved are most likely related to this event.
       * @param event A <strong>TreeExpansionEvent</strong> containing information about the node collapsed.
       */
      public void treeCollapsed(TreeExpansionEvent event) {
           ///ystem.err.println("Tree Collapsed");
           ignore = true;
+     }
      /** Any implementation of TreeExpansionListener must include this method so that we can be informed when a tree node has been expanded, thus indicating that any mouse click events about to be recieved are most likely related to this event.
+    public void treeCollapsed(TreeExpansionEvent event) {
+    ///ystem.err.println("Tree Collapsed");
+    ignore = true;
+    }
+    /** Any implementation of TreeExpansionListener must include this method so that we can be informed when a tree node has been expanded, thus indicating that any mouse click events about to be recieved are most likely related to this event.
       * @param event A <strong>TreeExpansionEvent</strong> containing information about the node expanded.
       */
      public void treeExpanded(TreeExpansionEvent event) {
           ///ystem.err.println("Tree Expanded");
           ignore = true;
+     }
+    public void treeExpanded(TreeExpansionEvent event) {
+    ///ystem.err.println("Tree Expanded");
+    ignore = true;
+    }
+}

trunk/gli/src/org/greenstone/gatherer/file/FileQueue.java

-              r4293
+              r4366
  */
 public class FileQueue
      extends Thread
+    extends Thread
     implements TreeSelectionListener {
      /** When someone requests the movement queue to be dumped this cancel flag is set to true. */
      private boolean cancel_action = false;
      /** A temporary mapping from currently existing FileNode folder to their equivelent FileNode folder within the undo managers tree. */
      private HashMap completed_folder_mappings = new HashMap();
      /** true to cause this file queue to return from run() as soon as there are no jobs left on the queue. Useful for undo jobs which must occur before a specific action. */
      private boolean return_immediately = false;
      /** We are only allowed to wait under specific circumstances. */
      private boolean wait_allowed = true;
      /** true if the user has selected yes to all from a file 'clash' dialog. */
      private boolean yes_to_all = false;
      /** A temporary mapping from currently existing FileNodes to the potential FileNode folder within the undo managers tree. */
      private HashMap recycle_folder_mappings = new HashMap();
      /** A label explaining the current moving files status. */
      private SmudgyLabel file_status = null;
      /** A label explaining the status of this job. */
      private JLabel job_status = null;
      /** A list containing a queue of waiting movement jobs. */
      //private LinkedList queue;
      private ArrayList queue;
      /** A progress bar which shows how many bytes, out of the total size of bytes, has been moved. */
      private LongProgressBar progress = null;
      /** The last piece of text shown on the file status label, just incase we are displaying a very temporary message. */
      private String previous = null;
      /** Constructor.
+    /** When someone requests the movement queue to be dumped this cancel flag is set to true. */
+    private boolean cancel_action = false;
+    /** A temporary mapping from currently existing FileNode folder to their equivelent FileNode folder within the undo managers tree. */
+    private HashMap completed_folder_mappings = new HashMap();
+    /** true to cause this file queue to return from run() as soon as there are no jobs left on the queue. Useful for undo jobs which must occur before a specific action. */
+    private boolean return_immediately = false;
+    /** We are only allowed to wait under specific circumstances. */
+    private boolean wait_allowed = true;
+    /** true if the user has selected yes to all from a file 'clash' dialog. */
+    private boolean yes_to_all = false;
+    /** A temporary mapping from currently existing FileNodes to the potential FileNode folder within the undo managers tree. */
+    private HashMap recycle_folder_mappings = new HashMap();
+    /** A label explaining the current moving files status. */
+    private SmudgyLabel file_status = null;
+    /** A label explaining the status of this job. */
+    private JLabel job_status = null;
+    /** A list containing a queue of waiting movement jobs. */
+    //private LinkedList queue;
+    private ArrayList queue;
+    /** A progress bar which shows how many bytes, out of the total size of bytes, has been moved. */
+    private LongProgressBar progress = null;
+    /** The last piece of text shown on the file status label, just incase we are displaying a very temporary message. */
+    private String previous = null;
+    /** Constructor.
       * @param return_immediately true to cause this file queue to return from run() as soon as there are no jobs left on the queue.
       * @see org.greenstone.gatherer.Configuration
 …
       * @see org.greenstone.gatherer.gui.LongProgressBar
       */
      public FileQueue(boolean return_immediately) {
           this.return_immediately = return_immediately;
           this.queue = new ArrayList();//LinkedList();
           String args[] = new String[2];
           args[0] = "0";
           args[1] = "0";
           file_status = new SmudgyLabel(get("Selected", args));
           job_status = new JLabel(get("No_Activity"));
           progress = new LongProgressBar();
           progress.setBackground(Gatherer.config.getColor("coloring.collection_tree_background", false));
           progress.setForeground(Gatherer.config.getColor("coloring.collection_tree_foreground", false));
           progress.setString(get("No_Activity"));
           progress.setStringPainted(true);
           args = null;
+     }
      /** Requeue an existing job into the queue.
+    public FileQueue(boolean return_immediately) {
+    this.return_immediately = return_immediately;
+    this.queue = new ArrayList();//LinkedList();
+    String args[] = new String[2];
+    args[0] = "0";
+    args[1] = "0";
+    file_status = new SmudgyLabel(get("Selected", args));
+    job_status = new JLabel(get("No_Activity"));
+    progress = new LongProgressBar();
+    progress.setBackground(Gatherer.config.getColor("coloring.collection_tree_background", false));
+    progress.setForeground(Gatherer.config.getColor("coloring.collection_tree_foreground", false));
+    progress.setString(get("No_Activity"));
+    progress.setStringPainted(true);
+    args = null;
+    }
+    /** Requeue an existing job into the queue.
       * @param job A previously created FileJob.
       */
      synchronized public void addJob(FileJob job, int position) {
           job.done = true; // Ensure that the requeued job is marked as done.
           queue.add(position, job);
           notify();
+     }
      /** Add a new job to the queue, specifiying as many arguments as is necessary to complete this type of job (ie delete needs no target information).
+    synchronized public void addJob(FileJob job, int position) {
+    job.done = true; // Ensure that the requeued job is marked as done.
+    queue.add(position, job);
+    notify();
+    }
+    /** Add a new job to the queue, specifiying as many arguments as is necessary to complete this type of job (ie delete needs no target information).
       * @param id A long id unique to all jobs created by a single action.
       * @param source The DragComponent source of this file, most likely a DragTree.
 …
       * @param undoable true if this job can generate undo or redo jobs at all, false otherwise.
       */
      public void addJob(long id, DragComponent source, FileNode child, DragComponent target, FileNode parent, byte type, boolean undo, boolean undoable, boolean folder_level) {
           addJob(id, source, child, target, parent, type, undo, undoable, folder_level, -1);
+     }
      synchronized public void addJob(long id, DragComponent source, FileNode child, DragComponent target, FileNode parent, byte type, boolean undo, boolean undoable, boolean folder_level, int position) {
           FileJob job = new FileJob(id, source, child, target, parent, type, undo, undoable);
           job.folder_level = folder_level;
           ///ystem.err.println("Adding job: " + job);
           if(position != -1 && position <= queue.size() + 1) {
                 queue.add(position, job);
+          }
           else {
                 queue.add(job);
+          }
           notify();
+     }
      public void calculateSize(FileNode[] files) {
           progress.reset();
           progress.setString(get("FileActions.Calculating_Size"));
           progress.setIndeterminate(true);
           Vector remaining = new Vector();
           for(int i = 0; i < files.length; i++) {
                 remaining.add(files[i]);
+          }
           while(remaining.size() > 0) {
                 FileNode node = (FileNode)remaining.remove(0);
                 if(node.isLeaf()) {
                      progress.addMaximum(node.getFile().length());
+                }
                 else {
                      for(int i = 0; i < node.getChildCount(); i++) {
                           remaining.add(node.getChildAt(i));
+                     }
+                }
+          }
           progress.setString(get("No_Activity"));
           progress.setIndeterminate(false);
+     }
      /** This method is called to cancel the job queue at the next available moment. */
      public void cancelAction() {
           cancel_action = true;
+     }
      /** Access to the file state label. */
      public JLabel getFileStatus() {
           return file_status;
+     }
      /** Access to the job state label. */
      public JLabel getJobStatus() {
           return job_status;
+     }
      /** Access to the progress bar. */
      public LongProgressBar getProgress() {
           return progress;
+     }
      /** Prevent the progress bar updating momentarily, while the progress bar size is re-adjusted. */
      public void pause() {
           progress.setIndeterminate(true);
+     }
      /** The run method exists in every thread, and here it is used to work its way through the queue of Jobs. If no jobs are waiting and it cans, it waits until a job arrives. If a job is present then it is either COPIED or DELETED, with the records being copied or removed as necessary, and directories being recursed through. Finally the user can press cancel to cause the loop to prematurely dump the job queue then wait.
+    public void addJob(long id, DragComponent source, FileNode child, DragComponent target, FileNode parent, byte type, boolean undo, boolean undoable, boolean folder_level) {
+    addJob(id, source, child, target, parent, type, undo, undoable, folder_level, -1);
+    }
+    synchronized public void addJob(long id, DragComponent source, FileNode child, DragComponent target, FileNode parent, byte type, boolean undo, boolean undoable, boolean folder_level, int position) {
+    FileJob job = new FileJob(id, source, child, target, parent, type, undo, undoable);
+    job.folder_level = folder_level;
+    ///ystem.err.println("Adding job: " + job);
+    if(position != -1 && position <= queue.size() + 1) {
+        queue.add(position, job);
+    }
+    else {
+        queue.add(job);
+    }
+    notify();
+    }
+    public void calculateSize(FileNode[] files) {
+    progress.reset();
+    progress.setString(get("FileActions.Calculating_Size"));
+    progress.setIndeterminate(true);
+    Vector remaining = new Vector();
+    for(int i = 0; i < files.length; i++) {
+        remaining.add(files[i]);
+    }
+    while(remaining.size() > 0) {
+        FileNode node = (FileNode)remaining.remove(0);
+        if(node.isLeaf()) {
+        progress.addMaximum(node.getFile().length());
+        }
+        else {
+        for(int i = 0; i < node.getChildCount(); i++) {
+            remaining.add(node.getChildAt(i));
+        }
+        }
+    }
+    progress.setString(get("No_Activity"));
+    progress.setIndeterminate(false);
+    }
+    /** This method is called to cancel the job queue at the next available moment. */
+    public void cancelAction() {
+    cancel_action = true;
+    }
+    /** Access to the file state label. */
+    public JLabel getFileStatus() {
+    return file_status;
+    }
+    /** Access to the job state label. */
+    public JLabel getJobStatus() {
+    return job_status;
+    }
+    /** Access to the progress bar. */
+    public LongProgressBar getProgress() {
+    return progress;
+    }
+    /** Prevent the progress bar updating momentarily, while the progress bar size is re-adjusted. */
+    public void pause() {
+    progress.setIndeterminate(true);
+    }
+    /** The run method exists in every thread, and here it is used to work its way through the queue of Jobs. If no jobs are waiting and it cans, it waits until a job arrives. If a job is present then it is either COPIED or DELETED, with the records being copied or removed as necessary, and directories being recursed through. Finally the user can press cancel to cause the loop to prematurely dump the job queue then wait.
       * @see org.greenstone.gatherer.Gatherer
       * @see org.greenstone.gatherer.collection.CollectionManager
 …
       * @see org.greenstone.gatherer.util.Utility
       */
+     public void run() {
+          super.setName("FileQueue");
+          while(!Gatherer.self.exit) {
+    public void run() {
+    super.setName("FileQueue");
+    while(!Gatherer.self.exit) {
+        try {
+        // Retrieve the next job
+        int position = queue.size() - 1;
+        FileJob job = removeJob(position);
+        if(job != null) {
+            ///ystem.err.println("Found job: " + job);
+            // The user can cancel this individual action at several places, so keep track if the state is 'ready' for the next step.
+            boolean ready = true;
+            FileNode origin_node = job.getOrigin();
+            FileNode destination_node = job.getDestination();
+            FileSystemModel source_model = (FileSystemModel)job.source.getTreeModel();
+            FileSystemModel target_model = (FileSystemModel)job.target.getTreeModel();
+            if(destination_node == null) {
+            // Retrieve the root node of the target model instead. A delete, or course, has no target file so all deleted files are added to the root of the Recycle Bin model.
+            destination_node = (FileNode) target_model.getRoot();
+            }
+            // Extract common job details.
+            File source_file = origin_node.getFile();
+            File target_file = null;
+            // Determine the target file for a copy or move.
+            if(job.type == FileJob.COPY || job.type == FileJob.MOVE) {
+            target_file = new File(destination_node.getFile(), source_file.getName());
+            }
+            // To copy a file, copy it then add any metadata found at the source. If this file was already in our collection then we must ensure the lastest version of its metadata.xml has been saved to disk. To copy a directory simply create the directory at the destination, then add all of its children files as new jobs.
+            if((job.type == FileJob.COPY || job.type == FileJob.MOVE) && !job.done) {
+            ///ystem.err.println("Copy/Move: " + origin_node);
+            FileNode new_node = null;
+            // Check if file exists, and action as necessary. Be aware the user can choose to cancel the action all together (where upon ready becomes false).
+            if(target_file.exists()) {
+                // We've previously been told
+                if(yes_to_all) {
+                // Remove the old file and tree entry.
+                target_file.delete();
+                ready = true;
+                }
+                else {
+                ///atherer.println("Opps! This filename already exists. Give the user some options.");
+                Object[] options = { get("General.Yes"), get("Yes_To_All"), get("General.No"), get("General.Cancel") };
+                int result = JOptionPane.showOptionDialog(Gatherer.g_man, get("File_Exists", target_file.getName()), get("General.Warning"), JOptionPane.DEFAULT_OPTION, JOptionPane.WARNING_MESSAGE, null, options, options[0]);
+                switch(result) {
+                case 1: // Yes To All
+                    yes_to_all = true;
+                case 0: // Yes
+                    // Remove the old file and tree entry.
+                    if(destination_node != null) {
+                    TreePath destination_path = new TreePath(destination_node.getPath());
+                    FileNode temp_target_node = new FileNode(target_file, target_model, true);
+                    TreePath target_path = destination_path.pathByAddingChild(temp_target_node);
+                    SynchronizedTreeModelTools.removeNodeFromParent(target_model, target_model.getNode(target_path));
+                    target_path = null;
+                    temp_target_node = null;
+                    destination_path = null;
+                    }
+                    target_file.delete();
+                    ready = true;
+                    break;
+                case 3: // No To All
+                    cancel_action = true;
+                case 2: // No
+                default:
+                    ready = false;
+                }
+                }
+            }
+            // We proceed with the copy/move if the ready flag is still set. If it is that means there is no longer any existing file of the same name.
+            if(ready) {
+                // update status area
+                String args[] = new String[1];
+                args[0] = "" + (queue.size() + 1) + "";
+                job_status.setText(get("Jobs", args));
+                if(job.type == FileJob.COPY) {
+                args[0] = Utility.formatPath("FileActions.Copying", source_file.getAbsolutePath(), file_status.getSize().width);
+                file_status.setText(get("Copying", args));
+                }
+                else {
+                args[0] = Utility.formatPath("FileActions.Moving", source_file.getAbsolutePath(), file_status.getSize().width);
+                file_status.setText(get("Moving", args));
+                }
+                args = null;
+                file_status.setToolTipText(Utility.formatHTMLWidth(file_status.getText(), 80));
+                // If source is a file
+                if(source_file.isFile()) {
+                // copy the file. If anything goes wrong the copy file should throw the appropriate exception. No matter what exception is thrown (bar an IOException) we display some message, perhaps take some action, then cancel the remainder of the pending file jobs. No point in being told your out of hard drive space for each one of six thousand files eh?
                 try {
+                     // Retrieve the next job
+                     int position = queue.size() - 1;
+                     FileJob job = removeJob(position);
+                     if(job != null) {
+                          ///ystem.err.println("Found job: " + job);
+                          // The user can cancel this individual action at several places, so keep track if the state is 'ready' for the next step.
+                          boolean ready = true;
+                          FileNode origin_node = job.getOrigin();
+                          FileNode destination_node = job.getDestination();
+                          FileSystemModel source_model = (FileSystemModel)job.source.getTreeModel();
+                          FileSystemModel target_model = (FileSystemModel)job.target.getTreeModel();
+                          if(destination_node == null) {
+                                // Retrieve the root node of the target model instead. A delete, or course, has no target file so all deleted files are added to the root of the Recycle Bin model.
+                                destination_node = (FileNode) target_model.getRoot();
+                          }
+                          // Extract common job details.
+                          File source_file = origin_node.getFile();
+                          File target_file = null;
+                          // Determine the target file for a copy or move.
+                          if(job.type == FileJob.COPY || job.type == FileJob.MOVE) {
+                                target_file = new File(destination_node.getFile(), source_file.getName());
+                          }
+                          // To copy a file, copy it then add any metadata found at the source. If this file was already in our collection then we must ensure the lastest version of its metadata.xml has been saved to disk. To copy a directory simply create the directory at the destination, then add all of its children files as new jobs.
+                          if((job.type == FileJob.COPY || job.type == FileJob.MOVE) && !job.done) {
+                                ///ystem.err.println("Copy/Move: " + origin_node);
+                                FileNode new_node = null;
+                                // Check if file exists, and action as necessary. Be aware the user can choose to cancel the action all together (where upon ready becomes false).
+                                if(target_file.exists()) {
+                                     // We've previously been told
+                                     if(yes_to_all) {
+                                          // Remove the old file and tree entry.
+                                          target_file.delete();
+                                          ready = true;
+                                     }
+                                     else {
+                                          ///atherer.println("Opps! This filename already exists. Give the user some options.");
+                                          Object[] options = { get("General.Yes"), get("Yes_To_All"), get("General.No"), get("General.Cancel") };
+                                          int result = JOptionPane.showOptionDialog(Gatherer.g_man, get("File_Exists", target_file.getName()), get("General.Warning"), JOptionPane.DEFAULT_OPTION, JOptionPane.WARNING_MESSAGE, null, options, options[0]);
+                                          switch(result) {
+                                          case 1: // Yes To All
+                                                yes_to_all = true;
+                                          case 0: // Yes
+                                                // Remove the old file and tree entry.
+                                                if(destination_node != null) {
+                                                     TreePath destination_path = new TreePath(destination_node.getPath());
+                                                     FileNode temp_target_node = new FileNode(target_file, target_model, true);
+                                                     TreePath target_path = destination_path.pathByAddingChild(temp_target_node);
+                                                     SynchronizedTreeModelTools.removeNodeFromParent(target_model, target_model.getNode(target_path));
+                                                     target_path = null;
+                                                     temp_target_node = null;
+                                                     destination_path = null;
+                                                }
+                                                target_file.delete();
+                                                ready = true;
+                                                break;
+                                          case 3: // No To All
+                                                cancel_action = true;
+                                          case 2: // No
+                                          default:
+                                                ready = false;
+                                          }
+                                     }
+                                }
+                                // We proceed with the copy/move if the ready flag is still set. If it is that means there is no longer any existing file of the same name.
+                                if(ready) {
+                                     // update status area
+                                     String args[] = new String[1];
+                                     args[0] = "" + (queue.size() + 1) + "";
+                                     job_status.setText(get("Jobs", args));
+                                     if(job.type == FileJob.COPY) {
+                                          args[0] = Utility.formatPath("FileActions.Copying", source_file.getAbsolutePath(), file_status.getSize().width);
+                                          file_status.setText(get("Copying", args));
+                                     }
+                                     else {
+                                          args[0] = Utility.formatPath("FileActions.Moving", source_file.getAbsolutePath(), file_status.getSize().width);
+                                          file_status.setText(get("Moving", args));
+                                     }
+                                     args = null;
+                                     file_status.setToolTipText(Utility.formatHTMLWidth(file_status.getText(), 80));
+                                     // If source is a file
+                                     if(source_file.isFile()) {
+                                          // copy the file. If anything goes wrong the copy file should throw the appropriate exception. No matter what exception is thrown (bar an IOException) we display some message, perhaps take some action, then cancel the remainder of the pending file jobs. No point in being told your out of hard drive space for each one of six thousand files eh?
+                                          try {
+                                                copyFile(source_file, target_file, progress);
+                                          }
+                                          // If we can't find the source file, then the most likely reason is that the file system has changed since the last time it was mapped. Warn the user that the requested file can't be found, then force a refresh of the source folder involved.
+                                          catch(FileNotFoundException fnf_exception) {
+                                                Gatherer.printStackTrace(fnf_exception);
+                                                cancel_action = true;
+                                                // Show warning.
+                                                JOptionPane.showMessageDialog(Gatherer.g_man, get("File_Not_Found_Message", source_file.getName()), get("File_Not_Found_Title"), JOptionPane.ERROR_MESSAGE);
+                                                // Force refresh of source folder.
+                                                source_model.refresh(new TreePath(((FileNode)origin_node.getParent()).getPath()));
+                                          }
+                                          catch(FileAlreadyExistsException fae_exception) {
+                                                Gatherer.printStackTrace(fae_exception);
+                                                cancel_action = true;
+                                                // Show warning.
+                                                JOptionPane.showMessageDialog(Gatherer.g_man, get("File_Already_Exists_Message", target_file.getName()), get("File_Already_Exists_Title"), JOptionPane.ERROR_MESSAGE);
+                                                // Nothing else can be done by the Gatherer.
+                                          }
+                                          catch(InsufficientSpaceException is_exception) {
+                                                Gatherer.printStackTrace(is_exception);
+                                                cancel_action = true;
+                                                // Show warning. The message body of the expection explains how much more space is required for this file copy.
+                                                JOptionPane.showMessageDialog(Gatherer.g_man, get("Insufficient_Space_Message", is_exception.getMessage()), get("Insufficient_Space_Title"), JOptionPane.ERROR_MESSAGE);
+                                                // Nothing else can be done by the Gatherer. In fact if we are really out of space I'm not even sure we can quit safely.
+                                          }
+                                          catch(UnknownFileErrorException ufe_exception) {
+                                                Gatherer.printStackTrace(ufe_exception);
+                                                cancel_action = true;
+                                                // Show warning
+                                                JOptionPane.showMessageDialog(Gatherer.g_man, get("Unknown_File_Error_Message"), get("Unknown_File_Error_Title"), JOptionPane.ERROR_MESSAGE);
+                                                // Nothing else we can do.
+                                          }
+                                          catch(IOException exception) {
+                                                // Can't really do much about this.
+                                                Gatherer.printStackTrace(exception);
+                                          }
+                                          // If not cancelled
+                                          if(!cancel_action) {
+                                                // Step one is to create a dummy FileNode. Its important it has the correct structure so getPath works.
+                                                FileNode new_record = new FileNode(target_file);
+                                                SynchronizedTreeModelTools.insertNodeInto(target_model, destination_node, new_record);
+                                              new_node = new_record;
+                                              // create undo job
+                                                if(job.undoable) {
+                                                     job.undoable = false;
+                                                     if(job.type == FileJob.COPY) {
+                                                          // A copy is undone with a delete, so it doesn't really matter where the file originally came from (we're not moving it back there, but into the recycle bin). You may also notice we don't make use of the target parent record. This is because no undo action needs this information, and even if it did it could simply ask for records parent!
+                                                          Gatherer.c_man.undo.addUndo(job.ID(), UndoManager.FILE_COPY, null, null, job.target, new_record, job.undo);
+                                                     }
+                                                     else {
+                                                          // Movements however do need a source and source parent so the file can be moved back to the correct place.
+                                                          Gatherer.c_man.undo.addUndo(job.ID(), UndoManager.FILE_MOVE, job.source, (FileNode)origin_node.getParent(), job.target, new_record, job.undo);
+                                                     }
+                                                }
+                                                new_record = null;
+                                          }
+                                     }
+                                     // Else
+                                     else if(source_file.isDirectory()) {
+                                          // create new record
+                                          FileNode directory_record = new FileNode(target_file);
+                                          ///ystem.err.println("Directory record = " + directory_record + " (" + target_file.getAbsolutePath() + ")");
+                                          SynchronizedTreeModelTools.insertNodeInto(target_model, destination_node, directory_record);
+                                          // Why is this not happening eh?
+                                          directory_record.setParent(destination_node);
+                                          if(!target_file.exists()) {
+                                             // make the directory
+                                                target_file.mkdirs();
+                                                new_node = directory_record;
+                                              // create undo job
+                                                if(job.undoable) {
+                                                     job.undoable = false;
+                                                     if(job.type == FileJob.COPY) {
+                                                          // A copy is undone with a delete, so it doesn't really matter where the file originally came from (we're not moving it back there, but into the recycle bin). You may also notice we don't make use of the target parent record. This is because no undo action needs this information, and even if it did it could simply ask for records parent!
+                                                          Gatherer.c_man.undo.addUndo(job.ID(), UndoManager.FILE_COPY, null, null, job.target, directory_record, job.undo);
+                                                     }
+                                                     else {
+                                                          // Movements however do need a source and source parent so the file can be moved back to the correct place.
+                                                          Gatherer.c_man.undo.addUndo(job.ID(), UndoManager.FILE_MOVE, job.source, (FileNode)origin_node.getParent(), job.target, directory_record, job.undo);
+                                                     }
+                                                }
+                                          }
+                                          // Else inform the users that a directory already exists and files will be copied into it
+                                          else {
+                                                JOptionPane.showMessageDialog(null, get("Directory_Exists", target_file.toString()), get("General.Warning"), JOptionPane.WARNING_MESSAGE);
+                                          }
+                                          // Queue non-filtered child files for copying. If this directory already existed, the child records will have to generate the undo jobs, as we don't want to entirely delete this directory if it already existed.
+                                          FileNode child_record = null;
+                                          // In order to have a sane copy proceedure (rather than always copying last file first as it used to) we always add the child node at the position the parent was removed from. Consider the file job 'a' at the end of the queue which generates three new jobs 'b', 'c' and 'd'. The resulting flow should look like this.
+                                          // -- Starting queue                   ...[a]
+                                          // remove(position) = 'a'              ...
+                                          // add(position, 'b')                  ...[b]
+                                          // add(position, 'c')                  ...[c][b]
+                                          // add(position, 'd')                  ...[d][c][b]
+                                          // Next loop
+                                          // remove(position) = 'b'              ...[d][c]
+                                          for(int i = 0; i < origin_node.getChildCount(); i++) {
+                                                child_record = (FileNode) origin_node.getChildAt(i);
+                                                addJob(job.ID(), job.source, child_record, job.target, directory_record, job.type, job.undo, false, false, position);
+                                          }
+                                          child_record = null;
+                                          directory_record = null;
+                                     }
+                                     // The file wasn't found!
+                                     else {
+                                          cancel_action = true;
+                                          // Show warning.
+                                          JOptionPane.showMessageDialog(Gatherer.g_man, get("File_Not_Found_Message", source_file.getName()), get("File_Not_Found_Title"), JOptionPane.ERROR_MESSAGE);
+                                          // Force refresh of source folder.
+                                          source_model.refresh(new TreePath(((FileNode)origin_node.getParent()).getPath()));
+                                     }
+                    copyFile(source_file, target_file, progress);
+                }
+                // If we can't find the source file, then the most likely reason is that the file system has changed since the last time it was mapped. Warn the user that the requested file can't be found, then force a refresh of the source folder involved.
+                catch(FileNotFoundException fnf_exception) {
+                    Gatherer.printStackTrace(fnf_exception);
+                    cancel_action = true;
+                    // Show warning.
+                    JOptionPane.showMessageDialog(Gatherer.g_man, get("File_Not_Found_Message", source_file.getName()), get("File_Not_Found_Title"), JOptionPane.ERROR_MESSAGE);
+                    // Force refresh of source folder.
+                    source_model.refresh(new TreePath(((FileNode)origin_node.getParent()).getPath()));
+                }
+                catch(FileAlreadyExistsException fae_exception) {
+                    Gatherer.printStackTrace(fae_exception);
+                    cancel_action = true;
+                    // Show warning.
+                    JOptionPane.showMessageDialog(Gatherer.g_man, get("File_Already_Exists_Message", target_file.getName()), get("File_Already_Exists_Title"), JOptionPane.ERROR_MESSAGE);
+                    // Nothing else can be done by the Gatherer.
+                }
+                catch(InsufficientSpaceException is_exception) {
+                    Gatherer.printStackTrace(is_exception);
+                    cancel_action = true;
+                    // Show warning. The message body of the expection explains how much more space is required for this file copy.
+                    JOptionPane.showMessageDialog(Gatherer.g_man, get("Insufficient_Space_Message", is_exception.getMessage()), get("Insufficient_Space_Title"), JOptionPane.ERROR_MESSAGE);
+                    // Nothing else can be done by the Gatherer. In fact if we are really out of space I'm not even sure we can quit safely.
+                }
+                catch(UnknownFileErrorException ufe_exception) {
+                    Gatherer.printStackTrace(ufe_exception);
+                    cancel_action = true;
+                    // Show warning
+                    JOptionPane.showMessageDialog(Gatherer.g_man, get("Unknown_File_Error_Message"), get("Unknown_File_Error_Title"), JOptionPane.ERROR_MESSAGE);
+                    // Nothing else we can do.
+                }
+                catch(IOException exception) {
+                    // Can't really do much about this.
+                    Gatherer.printStackTrace(exception);
+                }
+                // If not cancelled
+                if(!cancel_action) {
+                    // Step one is to create a dummy FileNode. Its important it has the correct structure so getPath works.
+                    FileNode new_record = new FileNode(target_file);
+                    SynchronizedTreeModelTools.insertNodeInto(target_model, destination_node, new_record);
+                    new_node = new_record;
+                    // create undo job
+                    if(job.undoable) {
+                    job.undoable = false;
+                    if(job.type == FileJob.COPY) {
+                        // A copy is undone with a delete, so it doesn't really matter where the file originally came from (we're not moving it back there, but into the recycle bin). You may also notice we don't make use of the target parent record. This is because no undo action needs this information, and even if it did it could simply ask for records parent!
+                        Gatherer.c_man.undo.addUndo(job.ID(), UndoManager.FILE_COPY, null, null, job.target, new_record, job.undo);
+                    }
+                    else {
+                        // Movements however do need a source and source parent so the file can be moved back to the correct place.
+                        Gatherer.c_man.undo.addUndo(job.ID(), UndoManager.FILE_MOVE, job.source, (FileNode)origin_node.getParent(), job.target, new_record, job.undo);
+                    }
+                    }
+                    new_record = null;
+                }
+                }
+                // Else
+                else if(source_file.isDirectory()) {
+                // create new record
+                FileNode directory_record = new FileNode(target_file);
+                ///ystem.err.println("Directory record = " + directory_record + " (" + target_file.getAbsolutePath() + ")");
+                SynchronizedTreeModelTools.insertNodeInto(target_model, destination_node, directory_record);
+                // Why is this not happening eh?
+                directory_record.setParent(destination_node);
+                if(!target_file.exists()) {
+                    // make the directory
+                    target_file.mkdirs();
+                    new_node = directory_record;
+                    // create undo job
+                    if(job.undoable) {
+                    job.undoable = false;
+                    if(job.type == FileJob.COPY) {
+                        // A copy is undone with a delete, so it doesn't really matter where the file originally came from (we're not moving it back there, but into the recycle bin). You may also notice we don't make use of the target parent record. This is because no undo action needs this information, and even if it did it could simply ask for records parent!
+                        Gatherer.c_man.undo.addUndo(job.ID(), UndoManager.FILE_COPY, null, null, job.target, directory_record, job.undo);
+                    }
+                    else {
+                        // Movements however do need a source and source parent so the file can be moved back to the correct place.
+                        Gatherer.c_man.undo.addUndo(job.ID(), UndoManager.FILE_MOVE, job.source, (FileNode)origin_node.getParent(), job.target, directory_record, job.undo);
+                    }
+                    }
+                }
+                // Else inform the users that a directory already exists and files will be copied into it
+                else {
+                    JOptionPane.showMessageDialog(null, get("Directory_Exists", target_file.toString()), get("General.Warning"), JOptionPane.WARNING_MESSAGE);
+                }
+                // Queue non-filtered child files for copying. If this directory already existed, the child records will have to generate the undo jobs, as we don't want to entirely delete this directory if it already existed.
+                FileNode child_record = null;
+                // In order to have a sane copy proceedure (rather than always copying last file first as it used to) we always add the child node at the position the parent was removed from. Consider the file job 'a' at the end of the queue which generates three new jobs 'b', 'c' and 'd'. The resulting flow should look like this.
+                // -- Starting queue                   ...[a]
+                // remove(position) = 'a'              ...
+                // add(position, 'b')                  ...[b]
+                // add(position, 'c')                  ...[c][b]
+                // add(position, 'd')                  ...[d][c][b]
+                // Next loop
+                // remove(position) = 'b'              ...[d][c]
+                for(int i = 0; i < origin_node.getChildCount(); i++) {
+                    child_record = (FileNode) origin_node.getChildAt(i);
+                    addJob(job.ID(), job.source, child_record, job.target, directory_record, job.type, job.undo, false, false, position);
+                }
+                child_record = null;
+                directory_record = null;
+                }
+                // The file wasn't found!
+                else {
+                cancel_action = true;
+                // Show warning.
+                JOptionPane.showMessageDialog(Gatherer.g_man, get("File_Not_Found_Message", source_file.getName()), get("File_Not_Found_Title"), JOptionPane.ERROR_MESSAGE);
+                // Force refresh of source folder.
+                source_model.refresh(new TreePath(((FileNode)origin_node.getParent()).getPath()));
+                }
                                      // We can't have been cancelled, and we must have created a new FileNode during the above phase, before we can handle metadata.
                                      if(!cancel_action && new_node != null) {
                                           /* Time to handle any existing metadata. */
                                           // If the directory came from inside our collection...
                                           if (job.source.toString().equals("Collection")) {
                                                 ///ystem.err.println("Move within collection...");
                                                 GDMManager gdm = Gatherer.c_man.getCollection().gdm;
                                               // we just retrieve the metadata attached to the origin node...
                                                 ArrayList existing_metadata = gdm.getMetadata(source_file);
                                                 ///ystem.err.println("Existing metadata for " + origin_node + ": " + gdm.toString(existing_metadata));
                                               // then assign this remainder to the new folder.
                                                 ///ystem.err.println("New metadata: " + gdm.toString(existing_metadata));
                                                 gdm.addMetadata(new_node, existing_metadata);
                                                 existing_metadata = null;
                                                 gdm = null;
+                                          }
                                           // If it came from the recycle bin retrieve the metadata from there, once again remembering to account for inherited metadata
                                           else if (job.source.toString().equals("Undo")) {
                                                 GDMManager gdm = Gatherer.c_man.getCollection().gdm;
                                                 // Retrieve metadata from the recycle bin
                                                 ArrayList existing_metadata = Gatherer.c_man.undo.getMetadata(source_file);
                                                 // then assign this remainder to the new folder.
                                                 gdm.addMetadata(new_node, existing_metadata);
                                                 existing_metadata = null;
                                                 gdm = null;
+                                          }
                                           // Otherwise if it came from the workspace use the MSMs parsers to search for folder level metadata (such as metadata.xml or marc records).
                                           else if (job.source.toString().equals("Workspace")) {
                                                 cancel_action = Gatherer.c_man.getCollection().msm.searchForMetadata(new_node, origin_node, source_file.isDirectory());
+                                          }
+                                     }
                                      new_node = null;
+                                }
+                          }
                           // If we haven't been cancelled, and we've been asked to delete a directory/file, or perhaps as part of a move, we delete the file. This involves removing any existing metadata and then copying the file to the recycled bin (for a delete only), then deleting the file. When deleting a directory record from the tree (or from the filesystem for that matter) we must ensure that all of the descendant records have already been removed. If we fail to do this the delete will fail, or you will be bombarded with hundreds of 'Parent node of null not allowed' error messages. Also be aware that if the user has cancelled just this action, because of say a name clash, then we shouldn't do any deleting of any sort dammit.
                           if(!cancel_action && ready && (job.type == FileJob.DELETE || job.type == FileJob.MOVE)) {
                                 ///ystem.err.print("Delete/Move: " + origin_node + " -> ");
                                 // If the source is an empty directory or a file. Don't do anything to the root node of a tree.
                                 File[] child_list = source_file.listFiles();
                                 if(source_file.isFile() || (child_list != null && (child_list.length == 0 || (child_list.length == 1 && child_list[0].getName().equals(Utility.METADATA_XML))) && origin_node.getParent() != null)) {
                                      ///ystem.err.println("File or empty directory.");
                                      // Delete any metadata.xml still in the directory.
                                      if(child_list != null && child_list.length == 1) {
                                           child_list[0].delete();
+                                     }
                                      ///ystem.err.println("Origin is file or is directory and is empty.");
                                      // update status area
                                      String args[] = new String[1];
                                      args[0] = "" + (queue.size() + 1) + "";
                                      job_status.setText(get("Jobs", args));
                                      args[0] = Utility.formatPath("FileActions.Deleting", source_file.getAbsolutePath(), file_status.getSize().width);
                                      file_status.setText(get("Deleting", args));
                                      args = null;
                                      file_status.setToolTipText(Utility.formatHTMLWidth(file_status.getText(), 80));
                                      // Remove its metadata
                                      ArrayList metadatum = null;
                                      if(job.source == Gatherer.c_man.undo) {
                                           Gatherer.c_man.undo.addMetadata(target_file, metadatum);
+                                     }
                                      else {
                                           metadatum= Gatherer.c_man.getCollection().gdm.removeMetadata(origin_node.getFile());
+                                     }
                                      // determine it parent node
                                      FileNode parent_record = (FileNode)origin_node.getParent();
                                      // Remove from model
                                      SynchronizedTreeModelTools.removeNodeFromParent(source_model, origin_node);
                                      // If we are deleting
                                      File recycled_file = null;
                                      FileNode recycled_parent = null;
                                      if(job.type == FileJob.DELETE) {
                                           // See if this record already has a previous recycle folder noted in the recycle folder mappings.
                                           recycled_parent = (FileNode) recycle_folder_mappings.get(origin_node);
                                           if(recycled_parent != null) {
                                                 recycle_folder_mappings.remove(origin_node);
+                                          }
                                           else {
                                                 recycled_parent = (FileNode) Gatherer.c_man.undo.getTreeModel().getRoot();
+                                          }
                                           // This may be a directory which we have already added previously.
                                           if(completed_folder_mappings.containsKey(origin_node)) {
                                                 FileNode recycled_record = (FileNode) completed_folder_mappings.get(origin_node);
                                               // Replace the temporary directory record in the undo tree with this one.
                                               SynchronizedTreeModelTools.replaceNode(Gatherer.c_man.undo.getTreeModel(), recycled_record, origin_node);
                                                 origin_node.setFile(recycled_record.getFile());
+                                          }
                                           else {
                                               // copy the file to the recycle bin
                                                 recycled_file = new File(recycled_parent.getFile(), origin_node.toString());
                                                 // If the file already exists, delete it.
                                                 if(recycled_file.exists()) {
                                                      recycled_file.delete();
+                                                }
                                                 recycled_file.deleteOnExit();
                                                 copyFile(source_file, recycled_file, progress);
                                                 origin_node.setFile(recycled_file);
                                               // Add the node to the appropriate place in the UndoManagers tree model. Unfortunately this one does have the possibility of altering the GUI (if the removeNodeFromParent above hasn't occured yet), so we must put it on the queue.
                                               SynchronizedTreeModelTools.insertNodeInto(Gatherer.c_man.undo.getTreeModel(), recycled_parent, origin_node);
+                                          }
                                           Gatherer.c_man.undo.addMetadata(source_file, metadatum);
+                                     }
                                      // delete the source file
                                      Utility.delete(source_file);
                                      // create undo job as necessary. File move would have been handled above.
                                      if(job.undoable) {
                                           job.undoable = false;
                                           // The target is null, indicating that we moved this file to the recycle bin. The UndoManager will replace null with 'this'.
                                           Gatherer.c_man.undo.addUndo(job.ID(), UndoManager.FILE_DELETE, job.source, parent_record, null, origin_node, job.undo);
+                                     }
                                      recycled_parent = null;
                                      recycled_file = null;
                                      //metadatum = null;
+                                }
                                 // Else the source is a directory and it has children remaining
                                 else if(child_list != null && child_list.length > 0) {
                                      ///ystem.err.print("Nonempty directory -> ");
                                      ///ystem.err.println("Directory is non-empty. Remove children first.");
                                      FileNode recycle_folder_record = null;
                                      // Don't worry about all this for true file move actions.
                                      if(job.type == FileJob.DELETE) {
                                           // See if this record already has a previous recycle folder noted in the recycle folder mappings.
                                           FileNode parent = (FileNode) recycle_folder_mappings.get(origin_node);
                                           if(parent != null) {
                                                 recycle_folder_mappings.remove(origin_node);
+                                          }
                                           else {
                                                 parent = (FileNode) Gatherer.c_man.undo.getTreeModel().getRoot();
+                                          }
                                           // We must add the folder node to our undo manager tree now, so we'll have something to add children to. We use a copy of the directory file record.
                                           File recycle_folder = new File(parent.getFile(), origin_node.toString());
                                           recycle_folder.deleteOnExit();
                                           recycle_folder.mkdirs();
                                           recycle_folder_record = new FileNode(recycle_folder);
                                           // Add this node to the undo tree model.
                                           SynchronizedTreeModelTools.insertNodeInto(Gatherer.c_man.undo.getTreeModel(), parent, recycle_folder_record);
                                           // We add an entry to the complete mappings to ensure this directory isn't added again
                                           completed_folder_mappings.put(origin_node, recycle_folder_record);
                                           ///ystem.err.println("Added completed directories mapping " + origin_node);
                                           // queue all of its children, (both filtered and non-filtered), but for deleting only. Don't queue jobs for a current move event, as they would be queued as part of copying. I have no idea way, per sec, however the children within the origin node are always invalid during deletion (there are several copies of some nodes?!?). I'll check that each child is only added once.
                                           ///ystem.err.println("Directory has " + origin_node.getChildCount() + " children.");
                                           ///ystem.err.println("Directory actually has " + child_list.length + " children.");
                                           origin_node.unmap();
                                           origin_node.map();
                                           ///ystem.err.println("Directory has " + origin_node.getChildCount() + " children.");
                                           ///ystem.err.println("Directory actually has " + child_list.length + " children.");
                                           for(int i = 0; i < origin_node.getChildCount(); i++) {
                                                 FileNode child_record = (FileNode) origin_node.getChildAt(i);
                                                 addJob(job.ID(), job.source, child_record, job.target, destination_node, FileJob.DELETE, job.undo, false, false, position);
                                                 if(recycle_folder_record != null) {
                                                      recycle_folder_mappings.put(child_record, recycle_folder_record);
+                                                }
+                                          }
+                                     }
                                      // Requeue a delete job -after- the children have been dealt with. Remember I've reversed the direction of the queue so sooner is later. Te-he. Also have to remember that we have have followed this path to get here for a move job: Copy Directory -> Queue Child Files -> Delete Directory (must occur after child files) -> Queue Directory.
                                      // One special case. Do not requeue root nodes. Don't requeue jobs marked as done.
                                      if(origin_node.getParent() != null && !job.done) {
                                           ///ystem.err.println("Requeue");
                                           job.type = FileJob.DELETE; // You only requeue jobs that are deletes, as directories must be inspected before children, but deleted after.
                                           addJob(job, position);
+                                     }
                                      else {
                                           ///ystem.err.println("I've already done this job twice. I refuse to requeue it again!!!");
+                                     }
+                                }
+                          }
                           job = null;
                           source_file = null;
                           target_file = null;
                           origin_node = null;
                           // We can only break out of the while loop if we are out of files, or if the action was cancelled.
                           if(cancel_action) {
                                 // Empty queue
                                 clearJobs();
                                 cancel_action = false;
+                          }
                           // Debugging pause.
                           ///ystem.err.println("Job complete.");
+                     }
                      else {
                           synchronized(this) {
                                 ///ystem.err.println("Queue size = " + queue.size());
                                 // Force the trees to refresh (but only if there is something on screen!)
                                 if(Gatherer.g_man != null) {
                                      Gatherer.g_man.refreshTrees();
+                                }
                                 // Reset status area
                                 job_status.setText(get("No_Selection"));
                                 file_status.setText(get("No_Activity"));
                                 progress.reset();
                                 progress.setString(get("No_Activity"));
                                 yes_to_all = false;
                                 completed_folder_mappings.clear();
                                 recycle_folder_mappings.clear();
                                 // Now wait if applicable.
                                 if(return_immediately) {
                                      return;
+                                }
                                 ///ystem.err.println("Waiting");
                                 wait();
+                          }
+                     }
+                }
                 catch (Exception error) {
                      Gatherer.printStackTrace(error);
+                }
+          }
+     }
      /** A second lock is necessary to prevent the thread waiting, because its notify occured momentarily before it waited. If the flag is set then the thread can't wait, but loops around. This may chew processor time so should only be used if you are certain files are about to be placed on the queue.
+                // We can't have been cancelled, and we must have created a new FileNode during the above phase, before we can handle metadata.
+                if(!cancel_action && new_node != null) {
+                /* Time to handle any existing metadata. */
+                // If the directory came from inside our collection...
+                if (job.source.toString().equals("Collection")) {
+                    ///ystem.err.println("Move within collection...");
+                    GDMManager gdm = Gatherer.c_man.getCollection().gdm;
+                    // we just retrieve the metadata attached to the origin node...
+                    ArrayList existing_metadata = gdm.getMetadata(source_file);
+                    ///ystem.err.println("Existing metadata for " + origin_node + ": " + gdm.toString(existing_metadata));
+                    // then assign this remainder to the new folder.
+                    ///ystem.err.println("New metadata: " + gdm.toString(existing_metadata));
+                    gdm.addMetadata(new_node, existing_metadata);
+                    existing_metadata = null;
+                    gdm = null;
+                }
+                // If it came from the recycle bin retrieve the metadata from there, once again remembering to account for inherited metadata
+                else if (job.source.toString().equals("Undo")) {
+                    GDMManager gdm = Gatherer.c_man.getCollection().gdm;
+                    // Retrieve metadata from the recycle bin
+                    ArrayList existing_metadata = Gatherer.c_man.undo.getMetadata(source_file);
+                    // then assign this remainder to the new folder.
+                    gdm.addMetadata(new_node, existing_metadata);
+                    existing_metadata = null;
+                    gdm = null;
+                }
+                // Otherwise if it came from the workspace use the MSMs parsers to search for folder level metadata (such as metadata.xml or marc records).
+                else if (job.source.toString().equals("Workspace")) {
+                    cancel_action = Gatherer.c_man.getCollection().msm.searchForMetadata(new_node, origin_node, source_file.isDirectory());
+                }
+                }
+                new_node = null;
+            }
+            }
+            // If we haven't been cancelled, and we've been asked to delete a directory/file, or perhaps as part of a move, we delete the file. This involves removing any existing metadata and then copying the file to the recycled bin (for a delete only), then deleting the file. When deleting a directory record from the tree (or from the filesystem for that matter) we must ensure that all of the descendant records have already been removed. If we fail to do this the delete will fail, or you will be bombarded with hundreds of 'Parent node of null not allowed' error messages. Also be aware that if the user has cancelled just this action, because of say a name clash, then we shouldn't do any deleting of any sort dammit.
+            if(!cancel_action && ready && (job.type == FileJob.DELETE || job.type == FileJob.MOVE)) {
+            ///ystem.err.print("Delete/Move: " + origin_node + " -> ");
+            // If the source is an empty directory or a file. Don't do anything to the root node of a tree.
+            File[] child_list = source_file.listFiles();
+            if(source_file.isFile() || (child_list != null && (child_list.length == 0 || (child_list.length == 1 && child_list[0].getName().equals(Utility.METADATA_XML))) && origin_node.getParent() != null)) {
+                ///ystem.err.println("File or empty directory.");
+                // Delete any metadata.xml still in the directory.
+                if(child_list != null && child_list.length == 1) {
+                child_list[0].delete();
+                }
+                ///ystem.err.println("Origin is file or is directory and is empty.");
+                // update status area
+                String args[] = new String[1];
+                args[0] = "" + (queue.size() + 1) + "";
+                job_status.setText(get("Jobs", args));
+                args[0] = Utility.formatPath("FileActions.Deleting", source_file.getAbsolutePath(), file_status.getSize().width);
+                file_status.setText(get("Deleting", args));
+                args = null;
+                file_status.setToolTipText(Utility.formatHTMLWidth(file_status.getText(), 80));
+                // Remove its metadata
+                ArrayList metadatum = null;
+                if(job.source == Gatherer.c_man.undo) {
+                Gatherer.c_man.undo.addMetadata(target_file, metadatum);
+                }
+                else {
+                metadatum= Gatherer.c_man.getCollection().gdm.removeMetadata(origin_node.getFile());
+                }
+                // determine it parent node
+                FileNode parent_record = (FileNode)origin_node.getParent();
+                // Remove from model
+                SynchronizedTreeModelTools.removeNodeFromParent(source_model, origin_node);
+                // If we are deleting
+                File recycled_file = null;
+                FileNode recycled_parent = null;
+                if(job.type == FileJob.DELETE) {
+                // See if this record already has a previous recycle folder noted in the recycle folder mappings.
+                recycled_parent = (FileNode) recycle_folder_mappings.get(origin_node);
+                if(recycled_parent != null) {
+                    recycle_folder_mappings.remove(origin_node);
+                }
+                else {
+                    recycled_parent = (FileNode) Gatherer.c_man.undo.getTreeModel().getRoot();
+                }
+                // This may be a directory which we have already added previously.
+                if(completed_folder_mappings.containsKey(origin_node)) {
+                    FileNode recycled_record = (FileNode) completed_folder_mappings.get(origin_node);
+                    // Replace the temporary directory record in the undo tree with this one.
+                    SynchronizedTreeModelTools.replaceNode(Gatherer.c_man.undo.getTreeModel(), recycled_record, origin_node);
+                    origin_node.setFile(recycled_record.getFile());
+                }
+                else {
+                    // copy the file to the recycle bin
+                    recycled_file = new File(recycled_parent.getFile(), origin_node.toString());
+                    // If the file already exists, delete it.
+                    if(recycled_file.exists()) {
+                    recycled_file.delete();
+                    }
+                    recycled_file.deleteOnExit();
+                    copyFile(source_file, recycled_file, progress);
+                    origin_node.setFile(recycled_file);
+                    // Add the node to the appropriate place in the UndoManagers tree model. Unfortunately this one does have the possibility of altering the GUI (if the removeNodeFromParent above hasn't occured yet), so we must put it on the queue.
+                    SynchronizedTreeModelTools.insertNodeInto(Gatherer.c_man.undo.getTreeModel(), recycled_parent, origin_node);
+                }
+                Gatherer.c_man.undo.addMetadata(source_file, metadatum);
+                }
+                // delete the source file
+                Utility.delete(source_file);
+                // create undo job as necessary. File move would have been handled above.
+                if(job.undoable) {
+                job.undoable = false;
+                // The target is null, indicating that we moved this file to the recycle bin. The UndoManager will replace null with 'this'.
+                Gatherer.c_man.undo.addUndo(job.ID(), UndoManager.FILE_DELETE, job.source, parent_record, null, origin_node, job.undo);
+                }
+                recycled_parent = null;
+                recycled_file = null;
+                //metadatum = null;
+            }
+            // Else the source is a directory and it has children remaining
+            else if(child_list != null && child_list.length > 0) {
+                ///ystem.err.print("Nonempty directory -> ");
+                ///ystem.err.println("Directory is non-empty. Remove children first.");
+                FileNode recycle_folder_record = null;
+                // Don't worry about all this for true file move actions.
+                if(job.type == FileJob.DELETE) {
+                // See if this record already has a previous recycle folder noted in the recycle folder mappings.
+                FileNode parent = (FileNode) recycle_folder_mappings.get(origin_node);
+                if(parent != null) {
+                    recycle_folder_mappings.remove(origin_node);
+                }
+                else {
+                    parent = (FileNode) Gatherer.c_man.undo.getTreeModel().getRoot();
+                }
+                // We must add the folder node to our undo manager tree now, so we'll have something to add children to. We use a copy of the directory file record.
+                File recycle_folder = new File(parent.getFile(), origin_node.toString());
+                recycle_folder.deleteOnExit();
+                recycle_folder.mkdirs();
+                recycle_folder_record = new FileNode(recycle_folder);
+                // Add this node to the undo tree model.
+                SynchronizedTreeModelTools.insertNodeInto(Gatherer.c_man.undo.getTreeModel(), parent, recycle_folder_record);
+                // We add an entry to the complete mappings to ensure this directory isn't added again
+                completed_folder_mappings.put(origin_node, recycle_folder_record);
+                ///ystem.err.println("Added completed directories mapping " + origin_node);
+                // queue all of its children, (both filtered and non-filtered), but for deleting only. Don't queue jobs for a current move event, as they would be queued as part of copying. I have no idea way, per sec, however the children within the origin node are always invalid during deletion (there are several copies of some nodes?!?). I'll check that each child is only added once.
+                ///ystem.err.println("Directory has " + origin_node.getChildCount() + " children.");
+                ///ystem.err.println("Directory actually has " + child_list.length + " children.");
+                origin_node.unmap();
+                origin_node.map();
+                ///ystem.err.println("Directory has " + origin_node.getChildCount() + " children.");
+                ///ystem.err.println("Directory actually has " + child_list.length + " children.");
+                for(int i = 0; i < origin_node.getChildCount(); i++) {
+                    FileNode child_record = (FileNode) origin_node.getChildAt(i);
+                    addJob(job.ID(), job.source, child_record, job.target, destination_node, FileJob.DELETE, job.undo, false, false, position);
+                    if(recycle_folder_record != null) {
+                    recycle_folder_mappings.put(child_record, recycle_folder_record);
+                    }
+                }
+                }
+                // Requeue a delete job -after- the children have been dealt with. Remember I've reversed the direction of the queue so sooner is later. Te-he. Also have to remember that we have have followed this path to get here for a move job: Copy Directory -> Queue Child Files -> Delete Directory (must occur after child files) -> Queue Directory.
+                // One special case. Do not requeue root nodes. Don't requeue jobs marked as done.
+                if(origin_node.getParent() != null && !job.done) {
+                ///ystem.err.println("Requeue");
+                job.type = FileJob.DELETE; // You only requeue jobs that are deletes, as directories must be inspected before children, but deleted after.
+                addJob(job, position);
+                }
+                else {
+                ///ystem.err.println("I've already done this job twice. I refuse to requeue it again!!!");
+                }
+            }
+            }
+            job = null;
+            source_file = null;
+            target_file = null;
+            origin_node = null;
+            // We can only break out of the while loop if we are out of files, or if the action was cancelled.
+            if(cancel_action) {
+            // Empty queue
+            clearJobs();
+            cancel_action = false;
+            }
+            // Debugging pause.
+            ///ystem.err.println("Job complete.");
+        }
+        else {
+            synchronized(this) {
+            ///ystem.err.println("Queue size = " + queue.size());
+            // Force the trees to refresh (but only if there is something on screen!)
+            if(Gatherer.g_man != null) {
+                Gatherer.g_man.refreshTrees();
+            }
+            // Reset status area
+            job_status.setText(get("No_Selection"));
+            file_status.setText(get("No_Activity"));
+            progress.reset();
+            progress.setString(get("No_Activity"));
+            yes_to_all = false;
+            completed_folder_mappings.clear();
+            recycle_folder_mappings.clear();
+            // Now wait if applicable.
+            if(return_immediately) {
+                return;
+            }
+            ///ystem.err.println("Waiting");
+            wait();
+            }
+        }
+        }
+        catch (Exception error) {
+        Gatherer.printStackTrace(error);
+        }
+    }
+    }
+    /** A second lock is necessary to prevent the thread waiting, because its notify occured momentarily before it waited. If the flag is set then the thread can't wait, but loops around. This may chew processor time so should only be used if you are certain files are about to be placed on the queue.
       * @param wait_allowed The new state of the wait_allowed flag, as a boolean.
       */
      public void setWaitAllowed(boolean wait_allowed) {
           this.wait_allowed = wait_allowed;
+     }
      /** Restore the progress bar so that it updates normally.
+    public void setWaitAllowed(boolean wait_allowed) {
+    this.wait_allowed = wait_allowed;
+    }
+    /** Restore the progress bar so that it updates normally.
       * @see org.greenstone.gatherer.gui.LongProgressBar
       */
      synchronized public void unpause() {
           progress.setIndeterminate(false);
           if(previous != null) {
                 progress.setString(previous);
                 previous = null;
+          }
+     }
      /** Called when the user makes some selection in one of the trees we are listening to. From this we update the status details. */
      public void valueChanged(TreeSelectionEvent event) {
           JTree tree = (JTree) event.getSource();
           if(tree.getSelectionCount() > 0) {
                 TreePath selection[] = tree.getSelectionPaths();
                 int file_count = 0;
                 int dir_count = 0;
                 for(int i = 0; i < selection.length; i++) {
                      TreeNode record = (TreeNode) selection[i].getLastPathComponent();
                      if(record.isLeaf()) {
                           file_count++;
+                     }
                      else {
                           dir_count++;
+                     }
                      record = null;
+                }
                 selection = null;
                 String args[] = new String[2];
                 args[0] = "" + file_count + "";
                 args[1] = "" + dir_count + "";
                 job_status.setText(get("Selected", args));
                 args = null;
+          }
           tree = null;
+     }
      synchronized private void clearJobs() {
           queue.clear();
+     }
      /** Copy a file from the source location to the destination location.
+    synchronized public void unpause() {
+    progress.setIndeterminate(false);
+    if(previous != null) {
+        progress.setString(previous);
+        previous = null;
+    }
+    }
+    /** Called when the user makes some selection in one of the trees we are listening to. From this we update the status details. */
+    public void valueChanged(TreeSelectionEvent event) {
+    JTree tree = (JTree) event.getSource();
+    if(tree.getSelectionCount() > 0) {
+        TreePath selection[] = tree.getSelectionPaths();
+        int file_count = 0;
+        int dir_count = 0;
+        for(int i = 0; i < selection.length; i++) {
+        TreeNode record = (TreeNode) selection[i].getLastPathComponent();
+        if(record.isLeaf()) {
+            file_count++;
+        }
+        else {
+            dir_count++;
+        }
+        record = null;
+        }
+        selection = null;
+        String args[] = new String[2];
+        args[0] = "" + file_count + "";
+        args[1] = "" + dir_count + "";
+        job_status.setText(get("Selected", args));
+        args = null;
+    }
+    tree = null;
+    }
+    synchronized private void clearJobs() {
+    queue.clear();
+    }
+    /** Copy a file from the source location to the destination location.
       * @param source The source File.
       * @param destination The destination File.
       * @see org.greenstone.gatherer.Gatherer
       */
      public void copyFile(File source, File destination, LongProgressBar progress)
           throws FileAlreadyExistsException, FileNotFoundException, InsufficientSpaceException, IOException, UnknownFileErrorException {
           if(source.isDirectory()) {
                 destination.mkdirs();
+          }
           else {
+    public void copyFile(File source, File destination, LongProgressBar progress)
+    throws FileAlreadyExistsException, FileNotFoundException, InsufficientSpaceException, IOException, UnknownFileErrorException {
+    if(source.isDirectory()) {
+        destination.mkdirs();
+    }
+    else {
                 // Check if the origin file exists.
                 if(!source.exists()) {
                      throw(new FileNotFoundException());
+                }
+        if(!source.exists()) {
+        throw(new FileNotFoundException());
+        }
                 // Check if the destination file does not exist.
                 if(destination.exists()) {
                      throw(new FileAlreadyExistsException());
+                }
                 File dirs = destination.getParentFile();
                 dirs.mkdirs();
+        if(destination.exists()) {
+        throw(new FileAlreadyExistsException());
+        }
+        File dirs = destination.getParentFile();
+        dirs.mkdirs();
                 // Copy the file.
                 FileInputStream f_in = new FileInputStream(source);
                 FileOutputStream f_out = new FileOutputStream(destination);
                 byte data[] = new byte[Utility.BUFFER_SIZE];
                 int data_size = 0;
                 while((data_size = f_in.read(data, 0, Utility.BUFFER_SIZE)) != -1 && !cancel_action) {
                      long destination_size = destination.length();
                      try {
                           f_out.write(data, 0, data_size);
+                     }
                      // If an IO exception occurs, we can do some maths to determine if the number of bytes written to the file was less than expected. If so we assume a InsufficientSpace exception. If not we just throw the exception again.
                      catch (IOException io_exception) {
                           if(destination_size + (long) data_size > destination.length()) {
                                 // Determine the difference (which I guess is in bytes).
                                 long difference = (destination_size + (long) data_size) - destination.length();
                                 // Transform that into a human readable string.
                                 String message = Utility.formatFileLength(difference);
                                 throw(new InsufficientSpaceException(message));
+                          }
                           else {
                                 throw(io_exception);
+                          }
+                     }
                      if(progress != null) {
                           progress.addValue(data_size);
+                     }
+                }
+        FileInputStream f_in = new FileInputStream(source);
+        FileOutputStream f_out = new FileOutputStream(destination);
+        byte data[] = new byte[Utility.BUFFER_SIZE];
+        int data_size = 0;
+        while((data_size = f_in.read(data, 0, Utility.BUFFER_SIZE)) != -1 && !cancel_action) {
+        long destination_size = destination.length();
+        try {
+            f_out.write(data, 0, data_size);
+        }
+        // If an IO exception occurs, we can do some maths to determine if the number of bytes written to the file was less than expected. If so we assume a InsufficientSpace exception. If not we just throw the exception again.
+        catch (IOException io_exception) {
+            if(destination_size + (long) data_size > destination.length()) {
+            // Determine the difference (which I guess is in bytes).
+            long difference = (destination_size + (long) data_size) - destination.length();
+            // Transform that into a human readable string.
+            String message = Utility.formatFileLength(difference);
+            throw(new InsufficientSpaceException(message));
+            }
+            else {
+            throw(io_exception);
+            }
+        }
+        if(progress != null) {
+            progress.addValue(data_size);
+        }
+        }
                 // Flush and close the streams to ensure all bytes are written.
                 f_in.close();
                 f_out.close();
+        f_in.close();
+        f_out.close();
                 // We have now, in theory, produced an exact copy of the source file. Check this by comparing sizes.
                 if(!cancel_action && source.length() != destination.length()) {
                      throw(new UnknownFileErrorException());
+                }
+        if(!cancel_action && source.length() != destination.length()) {
+        throw(new UnknownFileErrorException());
+        }
                 // If we were cancelled, ensure that none of the destination file exists.
                 if(cancel_action) {
                      destination.delete();
+                }
+          }
+     }
      /** Retrieve a phrase from the dictionary based on the key.
+        if(cancel_action) {
+        destination.delete();
+        }
+    }
+    }
+    /** Retrieve a phrase from the dictionary based on the key.
       * @param key The key index as a String.
       * @return The desired phrase also as a String.
       */
      private String get(String key) {
           return get(key, (String[])null);
+     }
      /** Retrieve a phrase from the dictionary based on the key, and taking into account the given argument.
+    private String get(String key) {
+    return get(key, (String[])null);
+    }
+    /** Retrieve a phrase from the dictionary based on the key, and taking into account the given argument.
       * @param key The key index as a String.
       * @param args A String which is the argument to be added to the phrase.
       * @return The desired phrase also as a String.
       */
      private String get(String key, String arg) {
           String args[] = new String[1];
           args[0] = arg;
           return get(key, args);
+     }
      /** Retrieve a phrase from the dictionary based on the key, and taking into account the given arguments.
+    private String get(String key, String arg) {
+    String args[] = new String[1];
+    args[0] = arg;
+    return get(key, args);
+    }
+    /** Retrieve a phrase from the dictionary based on the key, and taking into account the given arguments.
       * @param key The key index as a String.
       * @param args A String[] of arguments to be added to the phrase.
 …
       * @see org.greenstone.gatherer.Gatherer
       */
      private String get(String key, String args[]) {
           if(key.indexOf('.') == -1) {
                 key = "FileActions." + key;
+          }
           return Gatherer.dictionary.get(key, args);
+     }
      private FileJob removeJob(int position) {
           FileJob job = null;
           if(queue.size() > 0) {
                 job = (FileJob) queue.remove(position);
+          }
           return job;
+     }
+    private String get(String key, String args[]) {
+    if(key.indexOf('.') == -1) {
+        key = "FileActions." + key;
+    }
+    return Gatherer.dictionary.get(key, args);
+    }
+    private FileJob removeJob(int position) {
+    FileJob job = null;
+    if(queue.size() > 0) {
+        job = (FileJob) queue.remove(position);
+    }
+    return job;
+    }
+}

trunk/gli/src/org/greenstone/gatherer/file/FileSystemModel.java

-              r4293
+              r4366
 public class FileSystemModel
      extends DefaultTreeModel
      implements TreeExpansionListener, TreeWillExpandListener {
      private DragTree tree;
      private FileFilter current_filter;
      private FileFilter[] filters;
      static private FileFilter[] default_filters = { new FileFilter("\\..*", true), new FileFilter("metadata\\.xml", true) };
      public FileSystemModel(FileNode root) {
           super(root);
           current_filter = null;
           filters = null;
           tree = null;
           root.setModel(this);
           root.map();
+     }
      public FileFilter[] getFilters() {
           if(filters == null) {
                 if(current_filter != null) {
                      filters = new FileFilter[default_filters.length + 1];
                      filters[default_filters.length] = current_filter;
+                }
                 else {
                      filters = new FileFilter[default_filters.length];
+                }
                 System.arraycopy(default_filters, 0, filters, 0, default_filters.length);
+          }
           return filters;
+     }
+    extends DefaultTreeModel
+    implements TreeExpansionListener, TreeWillExpandListener {
+    private DragTree tree;
+    private FileFilter current_filter;
+    private FileFilter[] filters;
+    static private FileFilter[] default_filters = { new FileFilter("\\..*", true), new FileFilter("metadata\\.xml", true) };
+    public FileSystemModel(FileNode root) {
+    super(root);
+    current_filter = null;
+    filters = null;
+    tree = null;
+    root.setModel(this);
+    root.map();
+    }
+    public FileFilter[] getFilters() {
+    if(filters == null) {
+        if(current_filter != null) {
+        filters = new FileFilter[default_filters.length + 1];
+        filters[default_filters.length] = current_filter;
+        }
+        else {
+        filters = new FileFilter[default_filters.length];
+        }
+        System.arraycopy(default_filters, 0, filters, 0, default_filters.length);
+    }
+    return filters;
+    }
      /** Retrieve the node denoted by the given tree path. Note that this isn't equivelent to saying path.lastPathComponent, as the references within the path may be stale. */
      public FileNode getNode(TreePath path) {
           ///ystem.err.println("**** getNode(" + path + ") ****");
           FileNode current = (FileNode)root;
           // Special case for the root node. Check the first path component is the root node.
           FileNode first_node = (FileNode)path.getPathComponent(0);
           if(current.equals(first_node)) {
+    /** Retrieve the node denoted by the given tree path. Note that this isn't equivelent to saying path.lastPathComponent, as the references within the path may be stale. */
+    public FileNode getNode(TreePath path) {
+    ///ystem.err.println("**** getNode(" + path + ") ****");
+    FileNode current = (FileNode)root;
+    // Special case for the root node. Check the first path component is the root node.
+    FileNode first_node = (FileNode)path.getPathComponent(0);
+    if(current.equals(first_node)) {
                 ///ystem.err.println("First path component matches root node.");
                 // For each path with this tree path
                 for(int i = 1; current != null && i < path.getPathCount(); i++) {
                      // Retrieve the stale path
                      FileNode stale_node = (FileNode) path.getPathComponent(i);
                      ///ystem.err.print("Searching for '" + stale_node + "': ");
                      // Locate the fresh node by searching current's children. Remember to ensure that current is mapped.
                      current.map();
                      boolean found = false;
                      for(int j = 0; !found && j < current.getChildCount(); j++) {
                           FileNode child_node = (FileNode) current.getChildAt(j);
                           ///ystem.err.print(child_node + " ");
                           if(stale_node.equals(child_node)) {
                                 found = true;
                                 current = child_node;
                                 ///ystem.err.println("Found!");
+                          }
                           child_node = null;
+                     }
                      // If no match is found, then set current to null and exit.
                      if(!found) {
                           current = null;
                           ///ystem.err.println("Not Found!");
+                     }
                      // Repeat as necessary
+                }
+          }
           ///ystem.err.println("Returning node: " + new TreePath(current.getPath()));
           return current;
+     }
      public void insertNodeInto(MutableTreeNode newChild, MutableTreeNode parent, int index) {
           ///ystem.err.println("insertNodeInto(" + newChild + ", " + parent + ", " + index + ")");
           super.insertNodeInto(newChild, parent, index);
+     }
      public void mapDirectory(File directory, String title) {
           FileNode node = new FileNode(directory, this, title, true);
           SynchronizedTreeModelTools.insertNodeInto(this, (FileNode)root, node);
+     }
      /** Used to refresh the contents of the FileNode indicated by the tree path. While the refresh itself is a piece of the proverbial, the restoring of expanded folders afterwards is a nightmare, mainly because all of the tree paths are no longer valid (remember that refresh involves throwing away the node currents children and remapping them).
       * @param path The TreePath to the node to be refreshed.
       */
      public void refresh(TreePath path) {
           // If no path is set, take the path to the root node (ie update the whole tree)
           if(path == null) {
+        for(int i = 1; current != null && i < path.getPathCount(); i++) {
+        // Retrieve the stale path
+        FileNode stale_node = (FileNode) path.getPathComponent(i);
+        ///ystem.err.print("Searching for '" + stale_node + "': ");
+        // Locate the fresh node by searching current's children. Remember to ensure that current is mapped.
+        current.map();
+        boolean found = false;
+        for(int j = 0; !found && j < current.getChildCount(); j++) {
+            FileNode child_node = (FileNode) current.getChildAt(j);
+            ///ystem.err.print(child_node + " ");
+            if(stale_node.equals(child_node)) {
+            found = true;
+            current = child_node;
+            ///ystem.err.println("Found!");
+            }
+            child_node = null;
+        }
+        // If no match is found, then set current to null and exit.
+        if(!found) {
+            current = null;
+            ///ystem.err.println("Not Found!");
+        }
+        // Repeat as necessary
+        }
+    }
+    ///ystem.err.println("Returning node: " + new TreePath(current.getPath()));
+    return current;
+    }
+    public void insertNodeInto(MutableTreeNode newChild, MutableTreeNode parent, int index) {
+    ///ystem.err.println("insertNodeInto(" + newChild + ", " + parent + ", " + index + ")");
+    super.insertNodeInto(newChild, parent, index);
+    }
+    public void mapDirectory(File directory, String title) {
+    FileNode node = new FileNode(directory, this, title, true);
+    SynchronizedTreeModelTools.insertNodeInto(this, (FileNode)root, node);
+    }
+    /** Used to refresh the contents of the FileNode indicated by the tree path. While the refresh itself is a piece of the proverbial, the restoring of expanded folders afterwards is a nightmare, mainly because all of the tree paths are no longer valid (remember that refresh involves throwing away the node currents children and remapping them).
+     * @param path The TreePath to the node to be refreshed.
+     */
+    public void refresh(TreePath path) {
+    // If no path is set, take the path to the root node (ie update the whole tree)
+    if(path == null) {
                 ///ystem.err.println("Refresh entire tree.");
                 path = new TreePath(((FileNode)root).getPath());
+          }
           else {
+        path = new TreePath(((FileNode)root).getPath());
+    }
+    else {
                 ///ystem.err.println("Refresh: " + path.getLastPathComponent());
+          }
           // Only a valid action if this model is currently being displayed in a tree.
           if(tree != null) {
+    }
+    // Only a valid action if this model is currently being displayed in a tree.
+    if(tree != null) {
                 // Retrieve the error node.
                 FileNode node = (FileNode) path.getLastPathComponent();
+        FileNode node = (FileNode) path.getLastPathComponent();
                 // If this error node is a dummy node (ie has no associated file) we can't unmap it, so we iterate through its children refreshing each in turn.
                 if(node.getFile() == null) {
                      for(int i = 0; i < node.getChildCount(); i++) {
                           FileNode child = (FileNode) node.getChildAt(i);
                           refresh(new TreePath(child.getPath()));
                           child = null;
+                     }
+                }
+        if(node.getFile() == null) {
+        for(int i = 0; i < node.getChildCount(); i++) {
+            FileNode child = (FileNode) node.getChildAt(i);
+            refresh(new TreePath(child.getPath()));
+            child = null;
+        }
+        }
                 // Otherwise we refresh this node.
                 else {
                      // Record all of the expanded paths under this node. How come getExpandedDescendants returns more results each time.
                      Enumeration old_tree_paths = tree.getExpandedDescendants(path);
                      // Refresh the tree structure.
                      node.unmap();
                      node.map();
                      // Fire the appropriate event.
                      nodeStructureChanged(node);
                      // Then (painfully) restore the expanded paths. Note that the paths stored in the enumeration no longer exist, so I have to restore by node matching.
                      //counter = 0;
                      ///ystem.err.println("After:");
                      while(old_tree_paths != null && old_tree_paths.hasMoreElements()) {
                           //counter++;
                           FileNode current_node = node;
                           TreePath old_tree_path = (TreePath) old_tree_paths.nextElement();
                           ///ystem.err.println(counter + ". " + old_tree_path);
                           TreePath new_tree_path = new TreePath(path.getPath()); // Why isn't there a treepath copy constructor!
                           boolean not_found = false;
                           while(!not_found && old_tree_path.getPathCount() > new_tree_path.getPathCount()) {
                                 // Retrieve the new node in the old tree path
                                 FileNode old_path_node = (FileNode) old_tree_path.getPathComponent(new_tree_path.getPathCount());
                                 // Ensure the current node is mapped
                                 current_node.map();
                                 // Now attempt to match it to a child of the new paths last node.
                                 boolean found = false;
                                 for(int i = 0; !found && i < current_node.getChildCount(); i++) {
                                      FileNode target = (FileNode) current_node.getChildAt(i);
                                      ///ystem.err.println("Comparing " + old_path_node.toString() + " with " + target);
                                      if(target.toString().equals(old_path_node.toString())) {
                                           current_node = target;
                                           found = true;
+                                     }
                                      target = null;
+                                }
                                 old_path_node = null;
                                 // If we found a match, we add that to the new Tree Path and continue.
                                 if(found) {
                                      ///ystem.err.println("Found a match!");
                                      new_tree_path = new_tree_path.pathByAddingChild(current_node);
+                                }
                                 // We also have to record if we were unable to find a match in the current nodes children.
                                 else {
                                      ///ystem.err.println("Node not found.");
                                      not_found = true;
+                                }
+                          }
                           old_tree_path = null;
                           // If we've got this far, and haven't hit a not found, then we can assume we have the appropriate path, and ask the program to expand the new tree path
                           if(!not_found) {
                                 tree.expandPath(new_tree_path);
                                 ///ystem.err.println(" -> Expanded " + new_tree_path);
+                          }
                           else {
                                 ///ystem.err.println(" -> Cannot Expand " + new_tree_path);
+                          }
                           new_tree_path = null;
                           current_node = null;
+                     }
                      node = null;
+                }
+          }
           else {
+        else {
+        // Record all of the expanded paths under this node. How come getExpandedDescendants returns more results each time.
+        Enumeration old_tree_paths = tree.getExpandedDescendants(path);
+        // Refresh the tree structure.
+        node.unmap();
+        node.map();
+        // Fire the appropriate event.
+        nodeStructureChanged(node);
+        // Then (painfully) restore the expanded paths. Note that the paths stored in the enumeration no longer exist, so I have to restore by node matching.
+        //counter = 0;
+        ///ystem.err.println("After:");
+        while(old_tree_paths != null && old_tree_paths.hasMoreElements()) {
+            //counter++;
+            FileNode current_node = node;
+            TreePath old_tree_path = (TreePath) old_tree_paths.nextElement();
+            ///ystem.err.println(counter + ". " + old_tree_path);
+            TreePath new_tree_path = new TreePath(path.getPath()); // Why isn't there a treepath copy constructor!
+            boolean not_found = false;
+            while(!not_found && old_tree_path.getPathCount() > new_tree_path.getPathCount()) {
+            // Retrieve the new node in the old tree path
+            FileNode old_path_node = (FileNode) old_tree_path.getPathComponent(new_tree_path.getPathCount());
+            // Ensure the current node is mapped
+            current_node.map();
+            // Now attempt to match it to a child of the new paths last node.
+            boolean found = false;
+            for(int i = 0; !found && i < current_node.getChildCount(); i++) {
+                FileNode target = (FileNode) current_node.getChildAt(i);
+                ///ystem.err.println("Comparing " + old_path_node.toString() + " with " + target);
+                if(target.toString().equals(old_path_node.toString())) {
+                current_node = target;
+                found = true;
+                }
+                target = null;
+            }
+            old_path_node = null;
+            // If we found a match, we add that to the new Tree Path and continue.
+            if(found) {
+                ///ystem.err.println("Found a match!");
+                new_tree_path = new_tree_path.pathByAddingChild(current_node);
+            }
+            // We also have to record if we were unable to find a match in the current nodes children.
+            else {
+                ///ystem.err.println("Node not found.");
+                not_found = true;
+            }
+            }
+            old_tree_path = null;
+            // If we've got this far, and haven't hit a not found, then we can assume we have the appropriate path, and ask the program to expand the new tree path
+            if(!not_found) {
+            tree.expandPath(new_tree_path);
+            ///ystem.err.println(" -> Expanded " + new_tree_path);
+            }
+            else {
+            ///ystem.err.println(" -> Cannot Expand " + new_tree_path);
+            }
+            new_tree_path = null;
+            current_node = null;
+        }
+        node = null;
+        }
+    }
+    else {
                 ///ystem.err.println("No Tree!");
+          }
+     }
      public void setFilter(String pattern) {
           if(pattern != null) {
                 current_filter = new FileFilter(pattern, false);
+          }
           else {
                 current_filter = null;
+          }
           filters = null;
+     }
      public void setTree(DragTree tree) {
           this.tree = tree;
+     }
      public String toString() {
           if(tree != null) {
                 return tree.toString();
+          }
           return "FileSystemModel";
+     }
      /** Called whenever an item in the tree has been collapsed. */
      public void treeCollapsed(TreeExpansionEvent event) {
           // Deallocate the affected nodes children. Don't need to do this in a swing worker, as the nodes children are currently not visable.
           TreePath path = event.getPath();
           FileNode node = (FileNode) path.getLastPathComponent();
           node.unmap();
           // Fire the appropriate event.
           nodeStructureChanged(node);
+     }
      /** Called whenever an item in the tree has been expanded. */
      public void treeExpanded(TreeExpansionEvent event) {
+     }
      /** Invoked whenever a node in the tree is about to be collapsed. */
      public void treeWillCollapse(TreeExpansionEvent event)
           throws ExpandVetoException {
           // Veto the event if the user is attempting to collapse the root node (regardless of whether it is visible.
           TreePath path = event.getPath();
           if(path.getPathCount() == 1) {
                 throw new ExpandVetoException(event, "Cannot collapse root node!");
+          }
+     }
+    }
+    }
+    public void setFilter(String pattern) {
+    if(pattern != null) {
+        current_filter = new FileFilter(pattern, false);
+    }
+    else {
+        current_filter = null;
+    }
+    filters = null;
+    }
+    public void setTree(DragTree tree) {
+    this.tree = tree;
+    }
+    public String toString() {
+    if(tree != null) {
+        return tree.toString();
+    }
+    return "FileSystemModel";
+    }
+    /** Called whenever an item in the tree has been collapsed. */
+    public void treeCollapsed(TreeExpansionEvent event) {
+    // Deallocate the affected nodes children. Don't need to do this in a swing worker, as the nodes children are currently not visable.
+    TreePath path = event.getPath();
+    FileNode node = (FileNode) path.getLastPathComponent();
+    node.unmap();
+    // Fire the appropriate event.
+    nodeStructureChanged(node);
+    }
+    /** Called whenever an item in the tree has been expanded. */
+    public void treeExpanded(TreeExpansionEvent event) {
+    }
+    /** Invoked whenever a node in the tree is about to be collapsed. */
+    public void treeWillCollapse(TreeExpansionEvent event)
+    throws ExpandVetoException {
+    // Veto the event if the user is attempting to collapse the root node (regardless of whether it is visible.
+    TreePath path = event.getPath();
+    if(path.getPathCount() == 1) {
+        throw new ExpandVetoException(event, "Cannot collapse root node!");
+    }
+    }
      /** Invoked whenever a node in the tree is about to be expanded. */
      public void treeWillExpand(TreeExpansionEvent event)
           throws ExpandVetoException {
           // Set the wait cursor.
           Gatherer.g_man.wait(true);
           // Allocate the children. Don't need to do this in a swing worker, as the nodes children are currently not visable.
           TreePath path = event.getPath();
           FileNode node = (FileNode) path.getLastPathComponent();
           node.map();
           nodeStructureChanged(node);
           // Restore the cursor.
           Gatherer.g_man.wait(false);
+     }
+    /** Invoked whenever a node in the tree is about to be expanded. */
+    public void treeWillExpand(TreeExpansionEvent event)
+    throws ExpandVetoException {
+    // Set the wait cursor.
+    Gatherer.g_man.wait(true);
+    // Allocate the children. Don't need to do this in a swing worker, as the nodes children are currently not visable.
+    TreePath path = event.getPath();
+    FileNode node = (FileNode) path.getLastPathComponent();
+    node.map();
+    nodeStructureChanged(node);
+    // Restore the cursor.
+    Gatherer.g_man.wait(false);
+    }
+}

trunk/gli/src/org/greenstone/gatherer/file/InsufficientSpaceException.java

-              r4293
+              r4366
 public class InsufficientSpaceException
      extends Exception {
+    extends Exception {
      public InsufficientSpaceException(String message) {
           super(message);
+     }
+    public InsufficientSpaceException(String message) {
+    super(message);
+    }
+}

trunk/gli/src/org/greenstone/gatherer/file/UnknownFileErrorException.java

-              r4293
+              r4366
 public class UnknownFileErrorException
      extends Exception {
+    extends Exception {
      public UnknownFileErrorException() {
           super();
+     }
+    public UnknownFileErrorException() {
+    super();
+    }
+}

trunk/gli/src/org/greenstone/gatherer/gui/browser/GBrowserEvent.java

-              r4293
+              r4366
  */
 public class GBrowserEvent
      extends AWTEvent {
+    extends AWTEvent {
      /** The url payload of this event. */
      private GURL url = null;
+    /** The url payload of this event. */
+    private GURL url = null;
      private JProgressBar progress = null;
+    private JProgressBar progress = null;
      /** The message payload of this event. */
      private String message = null;
+    /** The message payload of this event. */
+    private String message = null;
      /** This contructor is used to pass events about GURLs out to its
       * listeners. The source and id are needed by the super class of AWTEvents
       * but the url is specific to this class.
       * @param source the class Object that fired this event.
       * @param id a numeric identifier for this event.
       * @param url the GURL about which this event is concerned.
       */
      public GBrowserEvent(Object source, int id, GURL url) {
           super(source, id);
           this.url = url;
+     }
+    /** This contructor is used to pass events about GURLs out to its
+     * listeners. The source and id are needed by the super class of AWTEvents
+     * but the url is specific to this class.
+     * @param source the class Object that fired this event.
+     * @param id a numeric identifier for this event.
+     * @param url the GURL about which this event is concerned.
+     */
+    public GBrowserEvent(Object source, int id, GURL url) {
+    super(source, id);
+    this.url = url;
+    }
      /** This contructor is used to pass events about GURLs out to its
       * listeners. The source and id are needed by the super class of AWTEvents
       * but the url and message are specific to this class.
       * @param source the class Object that fired this event.
       * @param id a numeric identifier for this event.
       * @param url the GURL about which this event is concerned.
       * @param message a message String, the reason for this event.
       */
      public GBrowserEvent(Object source, int id, GURL url, String message) {
           super(source, id);
           this.url = url;
+     }
+    /** This contructor is used to pass events about GURLs out to its
+     * listeners. The source and id are needed by the super class of AWTEvents
+     * but the url and message are specific to this class.
+     * @param source the class Object that fired this event.
+     * @param id a numeric identifier for this event.
+     * @param url the GURL about which this event is concerned.
+     * @param message a message String, the reason for this event.
+     */
+    public GBrowserEvent(Object source, int id, GURL url, String message) {
+    super(source, id);
+    this.url = url;
+    }
      /** This constructor is used to pass message events out to its listeners.
       * It is much the same as the first constructor, however instead of a
       * GURL as payload, we instead have a message String.
       * @param source the class Object that fired this event.
       * @param id a numeric identifier for this event.
       * @param message a message String, the reason for this event.
       */
      public GBrowserEvent(Object source, int id, String message) {
           super(source, id);
           this.message = message;
+     }
+    /** This constructor is used to pass message events out to its listeners.
+     * It is much the same as the first constructor, however instead of a
+     * GURL as payload, we instead have a message String.
+     * @param source the class Object that fired this event.
+     * @param id a numeric identifier for this event.
+     * @param message a message String, the reason for this event.
+     */
+    public GBrowserEvent(Object source, int id, String message) {
+    super(source, id);
+    this.message = message;
+    }
      /** Used to get the GURL contained within this event.
       * @return a GURL specifying the url this event is concerned with, or null
       * if this is a message type event.
       */
      public GURL getURL() {
           return url;
+     }
+    /** Used to get the GURL contained within this event.
+     * @return a GURL specifying the url this event is concerned with, or null
+     * if this is a message type event.
+     */
+    public GURL getURL() {
+    return url;
+    }
      /** Used to get the String message contained within this event.
       * @return a String containing the message for this event, or null if this
       * is a GURL type event.
       */
      public String getMessage() {
           return message;
+     }
+    /** Used to get the String message contained within this event.
+     * @return a String containing the message for this event, or null if this
+     * is a GURL type event.
+     */
+    public String getMessage() {
+    return message;
+    }
      /** Returns a boolean showing whether it is legal to request this GURLs
       * progress bar. All GURLs have progress bars, but only those spawned in
       * GHTMLPanes etc will actually have their progress bars updated. Webclient
       * does not yet support this functionality but will eventually via the
       * DocumentProgressEvent.
       * @return A boolean specifying whether this GURL supports ProgressBar
       * requests.
       */
      public boolean hasProgress() {
           if(progress != null) {
                 return true;
+          }
           return false;
+     }
+    /** Returns a boolean showing whether it is legal to request this GURLs
+     * progress bar. All GURLs have progress bars, but only those spawned in
+     * GHTMLPanes etc will actually have their progress bars updated. Webclient
+     * does not yet support this functionality but will eventually via the
+     * DocumentProgressEvent.
+     * @return A boolean specifying whether this GURL supports ProgressBar
+     * requests.
+     */
+    public boolean hasProgress() {
+    if(progress != null) {
+        return true;
+    }
+    return false;
+    }
+}

trunk/gli/src/org/greenstone/gatherer/gui/browser/GBrowserListener.java

-              r4293
+              r4366
 public interface GBrowserListener
      extends EventListener {
      public void actionFailed(GBrowserEvent event);
      public void controlsChanged();
      public void hyperlinkClick(GBrowserEvent event);
      public void renderBegun(GBrowserEvent event);
      public void renderComplete(GBrowserEvent event);
      public void statusChanged(GBrowserEvent event);
+    extends EventListener {
+    public void actionFailed(GBrowserEvent event);
+    public void controlsChanged();
+    public void hyperlinkClick(GBrowserEvent event);
+    public void renderBegun(GBrowserEvent event);
+    public void renderComplete(GBrowserEvent event);
+    public void statusChanged(GBrowserEvent event);
+}

trunk/gli/src/org/greenstone/gatherer/gui/browser/GHTMLPane.java

-              r4293
+              r4366
  */
 public class GHTMLPane
      extends JPanel
      implements HTMLViewPane, HyperlinkListener, PropertyChangeListener {
+    extends JPanel
+    implements HTMLViewPane, HyperlinkListener, PropertyChangeListener {
      /** follow_links - does the class automatically follow hyperlinks. */
      boolean follow_links = true;
      /** ready - has the view finished rendering the current URL. */
      boolean ready = true;
      /** the list of listeners associated with this class. */
      EventListenerList listeners = null;
      /** gatherer - a reference to the main class of Gatherer for messaging. */
      Gatherer gatherer = null;
      /** view - the JEditorPane the page content will be rendered on to. */
      JEditorPane view = null;
      Object control = null;
      /** current_page - the URL of the currently shown page. */
      GURL current_url = null;
      /** back_pages - Vector of pages that have been visited. */
      Vector back_pages = null;
      /** Vector of pages that have been backed up from.
       *  Reset whenever a new url 'path' is entered.
       */
      Vector forward_pages = null;
      /** Constructor - collects initial settings, lays out view, renders initial
       *  URL.
       *  @param gatherer - the main class of Gatherer
       */
      public GHTMLPane(Gatherer gatherer, Object control) {
           this.gatherer = gatherer;
           this.control = control;
           this.setLayout(new BorderLayout());
           listeners = new EventListenerList();
           back_pages = new Vector();
           forward_pages = new Vector();
           gatherer.debug("\t\tCreating GHTMLPane");
           view = new JEditorPane();
           view.setEditable(false);
           view.addHyperlinkListener(this);
           view.addPropertyChangeListener(this);
           this.add(new JScrollPane(view), BorderLayout.CENTER);
+     }
      public void addGBrowserListener(GBrowserListener listener) {
           listeners.add(GBrowserListener.class, listener);
+     }
      public void afterDisplay() {
           // Nothing to do. Only realy for embedded apps.
+     }
      public boolean back() {
           // Add current page to forward
           forward_pages.add(0,current_url);
           // Back up one page.
           current_url = (GURL) back_pages.lastElement();
           back_pages.remove(back_pages.size() - 1);
           this.setPage(current_url);
           return true;
+     }
      public boolean canBack() {
           if(back_pages.size() > 0 && ready) {
                 return true;
+          }
           return false;
+     }
      public boolean canForward() {
           if(forward_pages.size() > 0 && ready) {
                 return true;
+          }
           return false;
+     }
      public boolean canStop() {
           if(!ready) {
                 return true;
+          }
           return false;
+     }
      // This code courtesy of Horst ([email protected]) who provides this solution
      // to the crap null exception I keep getting when I try to grab the image
      // of a rendered HTML.
      public BufferedImage capture() {
           if(ready) {
+    /** follow_links - does the class automatically follow hyperlinks. */
+    boolean follow_links = true;
+    /** ready - has the view finished rendering the current URL. */
+    boolean ready = true;
+    /** the list of listeners associated with this class. */
+    EventListenerList listeners = null;
+    /** gatherer - a reference to the main class of Gatherer for messaging. */
+    Gatherer gatherer = null;
+    /** view - the JEditorPane the page content will be rendered on to. */
+    JEditorPane view = null;
+    Object control = null;
+    /** current_page - the URL of the currently shown page. */
+    GURL current_url = null;
+    /** back_pages - Vector of pages that have been visited. */
+    Vector back_pages = null;
+    /** Vector of pages that have been backed up from.
+     *  Reset whenever a new url 'path' is entered.
+     */
+    Vector forward_pages = null;
+    /** Constructor - collects initial settings, lays out view, renders initial
+     *  URL.
+     *  @param gatherer - the main class of Gatherer
+     */
+    public GHTMLPane(Gatherer gatherer, Object control) {
+    this.gatherer = gatherer;
+    this.control = control;
+    this.setLayout(new BorderLayout());
+    listeners = new EventListenerList();
+    back_pages = new Vector();
+    forward_pages = new Vector();
+    gatherer.debug("\t\tCreating GHTMLPane");
+    view = new JEditorPane();
+    view.setEditable(false);
+    view.addHyperlinkListener(this);
+    view.addPropertyChangeListener(this);
+    this.add(new JScrollPane(view), BorderLayout.CENTER);
+    }
+    public void addGBrowserListener(GBrowserListener listener) {
+    listeners.add(GBrowserListener.class, listener);
+    }
+    public void afterDisplay() {
+    // Nothing to do. Only realy for embedded apps.
+    }
+    public boolean back() {
+    // Add current page to forward
+    forward_pages.add(0,current_url);
+    // Back up one page.
+    current_url = (GURL) back_pages.lastElement();
+    back_pages.remove(back_pages.size() - 1);
+    this.setPage(current_url);
+    return true;
+    }
+    public boolean canBack() {
+    if(back_pages.size() > 0 && ready) {
+        return true;
+    }
+    return false;
+    }
+    public boolean canForward() {
+    if(forward_pages.size() > 0 && ready) {
+        return true;
+    }
+    return false;
+    }
+    public boolean canStop() {
+    if(!ready) {
+        return true;
+    }
+    return false;
+    }
+    // This code courtesy of Horst ([email protected]) who provides this solution
+    // to the crap null exception I keep getting when I try to grab the image
+    // of a rendered HTML.
+    public BufferedImage capture() {
+    if(ready) {
                 // Paint to an off screen buffer
                 Dimension size = view.getSize();
+        Dimension size = view.getSize();
                 //Graphics offgraphics = offscreen.getGraphics();
                 BufferedImage offscreen =
                      new BufferedImage(size.width, size.height,
                                              BufferedImage.TYPE_INT_RGB);
                 Graphics2D offgraphics = (Graphics2D) offscreen.getGraphics();
+        BufferedImage offscreen =
+        new BufferedImage(size.width, size.height,
+                  BufferedImage.TYPE_INT_RGB);
+        Graphics2D offgraphics = (Graphics2D) offscreen.getGraphics();
                 // For some reason the clip rect is null for the created image
                 // (usually it is set to the size of the image) so set it.
                 offgraphics.setClip(0, 0, size.width, size.height);
                 offgraphics.setColor(getBackground());
                 offgraphics.fillRect(0, 0, size.width, size.height);
+        offgraphics.setClip(0, 0, size.width, size.height);
+        offgraphics.setColor(getBackground());
+        offgraphics.fillRect(0, 0, size.width, size.height);
                 // This will display components in the HTML Page
                 view.paint(offgraphics);
                 return offscreen;
+          }
           return null;
+     }
+        view.paint(offgraphics);
+        return offscreen;
+    }
+    return null;
+    }
      public GURL current() {
           return current_url;
+     }
      public void followHyperlinks(boolean value) {
           follow_links = value;
+     }
      public boolean forward() {
           // Add current page to back
           back_pages.add(current_url);
           // Show forward page.
           current_url = (GURL) forward_pages.firstElement();
           forward_pages.remove(0);
           setPage(current_url);
           return true;
+     }
      /** Since you can't add an interface to a component hierarchy this method is required to get a reference of the actual rendering component.
       * @return This HTMLViewPane implementation as a component.
       */
      public Component getContent() {
           return this;
+     }
      public JProgressBar getProgress() {
           // Currently not available. Will have to do some magic using the
           // view.getStream() function.
           return null;
+     }
      /** When a hyperlink event is fired we handle it in one of several ways,
       * based on the event type. Enters and exits get fired off as messages to
       * the listeners so they can update their status bars. Clicks also fire
       * status changes, but their event messages include the GURLs incase we
       * to do something special to them. Furthermore if follow hyperlinks is
       * set the browser is responsible for loading up the newly designated url.
       * @param event A HyperlinkEvent containing useful data about the event,
       * such as the url in question and the position of the mouse. It also is
       * marked as one of several types of events including ENTERED and EXITED
       * (for mouseovers) and ACTIVATED (clicked).
       */
      public void hyperlinkUpdate(HyperlinkEvent event) {
           Object event_type = event.getEventType();
           GURL new_url = new GURL(event.getURL());
           // The mouse has been moved over a hyperlink.
           if (event_type == HyperlinkEvent.EventType.ENTERED) {
                 fireStatusChange(new GURL(event.getURL()));
+          }
           else if (event_type == HyperlinkEvent.EventType.EXITED) {
                 fireStatusChange(null);
+          }
           else if (event_type == HyperlinkEvent.EventType.ACTIVATED) {
                 fireHyperlinkClick(new_url);
                 if(follow_links) {
                      show(new_url);
+                }
+          }
+     }
      public boolean isReady() {
           return ready;
+     }
      public void propertyChange(PropertyChangeEvent evt) {
           if(evt.getPropertyName() == "page") {
                 ready = true;
                 fireRenderComplete(current_url);
+          }
+     }
      public void removeGBrowserListener(GBrowserListener listener) {
           listeners.remove(GBrowserListener.class, listener);
+     }
      public void setEnabled(boolean value) {
           ready = value;
+     }
      public boolean show(String filename) {
           return show(new GURL("file:"+filename));
+     }
      /**
+      *
       * Precondition: ready = true <BR>
       */
      public boolean show(GURL url) {
           if(current_url == null) {
                 fireRenderBegun(url);
                 current_url = url;
                 setPage(current_url);
                 return true;
+          }
           else {
+    public GURL current() {
+    return current_url;
+    }
+    public void followHyperlinks(boolean value) {
+    follow_links = value;
+    }
+    public boolean forward() {
+    // Add current page to back
+    back_pages.add(current_url);
+    // Show forward page.
+    current_url = (GURL) forward_pages.firstElement();
+    forward_pages.remove(0);
+    setPage(current_url);
+    return true;
+    }
+    /** Since you can't add an interface to a component hierarchy this method is required to get a reference of the actual rendering component.
+     * @return This HTMLViewPane implementation as a component.
+     */
+    public Component getContent() {
+    return this;
+    }
+    public JProgressBar getProgress() {
+    // Currently not available. Will have to do some magic using the
+    // view.getStream() function.
+    return null;
+    }
+    /** When a hyperlink event is fired we handle it in one of several ways,
+     * based on the event type. Enters and exits get fired off as messages to
+     * the listeners so they can update their status bars. Clicks also fire
+     * status changes, but their event messages include the GURLs incase we
+     * to do something special to them. Furthermore if follow hyperlinks is
+     * set the browser is responsible for loading up the newly designated url.
+     * @param event A HyperlinkEvent containing useful data about the event,
+     * such as the url in question and the position of the mouse. It also is
+     * marked as one of several types of events including ENTERED and EXITED
+     * (for mouseovers) and ACTIVATED (clicked).
+     */
+    public void hyperlinkUpdate(HyperlinkEvent event) {
+    Object event_type = event.getEventType();
+    GURL new_url = new GURL(event.getURL());
+    // The mouse has been moved over a hyperlink.
+    if (event_type == HyperlinkEvent.EventType.ENTERED) {
+        fireStatusChange(new GURL(event.getURL()));
+    }
+    else if (event_type == HyperlinkEvent.EventType.EXITED) {
+        fireStatusChange(null);
+    }
+    else if (event_type == HyperlinkEvent.EventType.ACTIVATED) {
+        fireHyperlinkClick(new_url);
+        if(follow_links) {
+        show(new_url);
+        }
+    }
+    }
+    public boolean isReady() {
+    return ready;
+    }
+    public void propertyChange(PropertyChangeEvent evt) {
+    if(evt.getPropertyName() == "page") {
+        ready = true;
+        fireRenderComplete(current_url);
+    }
+    }
+    public void removeGBrowserListener(GBrowserListener listener) {
+    listeners.remove(GBrowserListener.class, listener);
+    }
+    public void setEnabled(boolean value) {
+    ready = value;
+    }
+    public boolean show(String filename) {
+    return show(new GURL("file:"+filename));
+    }
+    /**
+     *
+     * Precondition: ready = true <BR>
+     */
+    public boolean show(GURL url) {
+    if(current_url == null) {
+        fireRenderBegun(url);
+        current_url = url;
+        setPage(current_url);
+        return true;
+    }
+    else {
                 // If we are not already showing this url
                 if(!current_url.toString().equals(url.toString())) {
                      fireRenderBegun(url);
                      // Save a copy of the current page
                      back_pages.add(current_url);
                      current_url = url;
                      setPage(current_url);
                      return true;
+                }
+          }
           return false;
+     }
      public boolean stop() {
           // Unfortunately a JEditorPane is not sophisticated enough to support
           // this. Pretty much once you send the page to be rendered only killing
           // the thread will stop it, and I'm not sure you can restart the thread
           // later.
           return false;
+     }
      protected void fireActionFailed(GURL url) {
           GBrowserEvent event = new GBrowserEvent(this,0,url);
           Object[] concerned = listeners.getListenerList();
           for(int i = 0; i < concerned.length ; i++) {
                 if(concerned[i] == GBrowserListener.class) {
                      ((GBrowserListener)concerned[i+1]).actionFailed(event);
+                }
+          }
+     }
      protected void fireControlsChanged() {
           Object[] concerned = listeners.getListenerList();
           for(int i = 0; i < concerned.length ; i++) {
                 if(concerned[i] == GBrowserListener.class) {
                      ((GBrowserListener)concerned[i+1]).controlsChanged();
+                }
+          }
+     }
      protected void fireHyperlinkClick(GURL url) {
           GBrowserEvent event = new GBrowserEvent(this,0,url);
           Object[] concerned = listeners.getListenerList();
           for(int i = 0; i < concerned.length ; i++) {
                 if(concerned[i] == GBrowserListener.class) {
                      ((GBrowserListener)concerned[i+1]).hyperlinkClick(event);
+                }
+          }
+     }
      protected void fireRenderBegun(GURL url) {
           GBrowserEvent event = new GBrowserEvent(this,0,url);
           Object[] concerned = listeners.getListenerList();
           for(int i = 0; i < concerned.length ; i++) {
                 if(concerned[i] == GBrowserListener.class) {
                      ((GBrowserListener)concerned[i+1]).renderBegun(event);
+                }
+          }
+     }
      protected void fireRenderComplete(GURL url) {
           GBrowserEvent event = new GBrowserEvent(this,0,url);
           Object[] concerned = listeners.getListenerList();
           for(int i = 0; i < concerned.length ; i++) {
                 if(concerned[i] == GBrowserListener.class) {
                      ((GBrowserListener)concerned[i+1]).renderComplete(event);
+                }
+          }
+     }
      protected void fireStatusChange(GURL url) {
           GBrowserEvent event = new GBrowserEvent(this,0,url);
           Object[] concerned = listeners.getListenerList();
           for(int i = 0; i < concerned.length ; i++) {
                 if(concerned[i] == GBrowserListener.class) {
                      ((GBrowserListener)concerned[i+1]).statusChanged(event);
+                }
+          }
+     }
      private void setPage(GURL url) {
           try {
                 view.setPage(url.getURL());
+          }
           catch (IOException e) {
                 Utility.showError(gatherer, "GHTMLPane.setPage()", e);
+          }
           catch (Exception e) {
                 Utility.showError(gatherer, "Arrggg...", e);
+          }
+     }
+        if(!current_url.toString().equals(url.toString())) {
+        fireRenderBegun(url);
+        // Save a copy of the current page
+        back_pages.add(current_url);
+        current_url = url;
+        setPage(current_url);
+        return true;
+        }
+    }
+    return false;
+    }
+    public boolean stop() {
+    // Unfortunately a JEditorPane is not sophisticated enough to support
+    // this. Pretty much once you send the page to be rendered only killing
+    // the thread will stop it, and I'm not sure you can restart the thread
+    // later.
+    return false;
+    }
+    protected void fireActionFailed(GURL url) {
+    GBrowserEvent event = new GBrowserEvent(this,0,url);
+    Object[] concerned = listeners.getListenerList();
+    for(int i = 0; i < concerned.length ; i++) {
+        if(concerned[i] == GBrowserListener.class) {
+        ((GBrowserListener)concerned[i+1]).actionFailed(event);
+        }
+    }
+    }
+    protected void fireControlsChanged() {
+    Object[] concerned = listeners.getListenerList();
+    for(int i = 0; i < concerned.length ; i++) {
+        if(concerned[i] == GBrowserListener.class) {
+        ((GBrowserListener)concerned[i+1]).controlsChanged();
+        }
+    }
+    }
+    protected void fireHyperlinkClick(GURL url) {
+    GBrowserEvent event = new GBrowserEvent(this,0,url);
+    Object[] concerned = listeners.getListenerList();
+    for(int i = 0; i < concerned.length ; i++) {
+        if(concerned[i] == GBrowserListener.class) {
+        ((GBrowserListener)concerned[i+1]).hyperlinkClick(event);
+        }
+    }
+    }
+    protected void fireRenderBegun(GURL url) {
+    GBrowserEvent event = new GBrowserEvent(this,0,url);
+    Object[] concerned = listeners.getListenerList();
+    for(int i = 0; i < concerned.length ; i++) {
+        if(concerned[i] == GBrowserListener.class) {
+        ((GBrowserListener)concerned[i+1]).renderBegun(event);
+        }
+    }
+    }
+    protected void fireRenderComplete(GURL url) {
+    GBrowserEvent event = new GBrowserEvent(this,0,url);
+    Object[] concerned = listeners.getListenerList();
+    for(int i = 0; i < concerned.length ; i++) {
+        if(concerned[i] == GBrowserListener.class) {
+        ((GBrowserListener)concerned[i+1]).renderComplete(event);
+        }
+    }
+    }
+    protected void fireStatusChange(GURL url) {
+    GBrowserEvent event = new GBrowserEvent(this,0,url);
+    Object[] concerned = listeners.getListenerList();
+    for(int i = 0; i < concerned.length ; i++) {
+        if(concerned[i] == GBrowserListener.class) {
+        ((GBrowserListener)concerned[i+1]).statusChanged(event);
+        }
+    }
+    }
+    private void setPage(GURL url) {
+    try {
+        view.setPage(url.getURL());
+    }
+    catch (IOException e) {
+        Utility.showError(gatherer, "GHTMLPane.setPage()", e);
+    }
+    catch (Exception e) {
+        Utility.showError(gatherer, "Arrggg...", e);
+    }
+    }
+}

trunk/gli/src/org/greenstone/gatherer/gui/browser/HTMLViewPane.java

-              r4293
+              r4366
 /** HTMLViewPane provides the interface that all implementations must adhere to. The methods shown are used by Gatherer to interact with the rendered HTML pane, and in turn recieve messages back. */
 public interface HTMLViewPane {
      /** Add a GBrowserListener to this browser.
       * @param listener an object which implements the GBrowserListener interface.
+    /** Add a GBrowserListener to this browser.
+     * @param listener an object which implements the GBrowserListener interface.
       */
      public void addGBrowserListener(GBrowserListener listener);
+    public void addGBrowserListener(GBrowserListener listener);
      public void afterDisplay();
+    public void afterDisplay();
   /**
 …
     * @return value - whether or not the operation was successful
     */
   public boolean back();
   /**
+    public boolean back();
+    /**
     * CanBack is used to determine if there are further pages to 'back' to, and
     * based on the result whether the functionality should be available
     */
   public boolean canBack();
   /**
+    public boolean canBack();
+    /**
     * CanForward performs approximately the same duty as canBack except, of
     * course, in the opposite direction.
     */
   public boolean canForward();
      /**
+    public boolean canForward();
+    /**
       * CanStop determines whether the stop functionality is available. In general
       * you have to be doing something before you can stop it!
       */
      public boolean canStop();
   /**
+    public boolean canStop();
+    /**
    * Capture is used to grab a buffered image of the current graphics context of
    * the HTML pane. Note that this may not actually be feasible in embedded
 …
    * panes graphics buffer.
    */
   public BufferedImage capture();
   /**
+    public BufferedImage capture();
+    /**
    * When called this method returns the URL of the resource currently being
    * displayed (or rendered). If no resource has been requested the return URL
 …
    * @return url - the GURL of the currently displayed resource.
    */
   public GURL current();
   /**
+    public GURL current();
+    /**
    * This method is used to tell the HTML pane whether it should attempt to
    * follow hyperlinks when a user clicks them. Whether this is set or not the
 …
    * @param on - whether followHyperlinks is; on (= true) or off.
    */
   public void followHyperlinks(boolean value);
   /**
+    public void followHyperlinks(boolean value);
+    /**
     * Forward is a call for the HTMLViewPane implementation to move forward one
     * page in its browser history. It should react appropriately to calls to this
 …
     * @return value - whether of not the operation was successfull
     */
   public boolean forward();
      /** In order to add the class that implements this interface to a component hierarchy you require some way to get at the component. This is that way.
+    public boolean forward();
+    /** In order to add the class that implements this interface to a component hierarchy you require some way to get at the component. This is that way.
       * @return a component reference of this class (as compared to the interface one you started with).
       */
      public Component getContent();
   /**
+    public Component getContent();
+    /**
    * If called, getProgressBar should return a reference to a JProgress bar. The
    * HTML pane is then resposible for updating the progress bar for its lifetime
 …
    * towards displaying a url or null.
    */
   public JProgressBar getProgress();
   /** Before attempting to issue futher instructions to the HTML pane, Gatherer must first ensure that its ready. A pane should always be responsive but there are foreseeable times when an interrupt to go to a new page may cause the renderer to become unstable, or perhaps a user is filling out a form and thus shouldn't be pre-empted.
+    public JProgressBar getProgress();
+    /** Before attempting to issue futher instructions to the HTML pane, Gatherer must first ensure that its ready. A pane should always be responsive but there are foreseeable times when an interrupt to go to a new page may cause the renderer to become unstable, or perhaps a user is filling out a form and thus shouldn't be pre-empted.
    * @return <i>true</i> if the pane is ready for further instructions, <i>false</i> if not.
    */
   public boolean isReady();
   /**
+    public boolean isReady();
+    /**
    * SetEnabled is used to temporarily prevent further user interaction with the
    * pane. This may be caused by certain user requests in other parts of Gatherer
 …
    * @param on - what state the component should be in; on (= true) or off.
    */
   public void setEnabled(boolean value);
      /** Remove a GBrowserListener from this browser.
+    public void setEnabled(boolean value);
+    /** Remove a GBrowserListener from this browser.
       * @param listener an object which implements the GBrowserListener interface.
       */
      public void removeGBrowserListener(GBrowserListener listener);
      /**
+    public void removeGBrowserListener(GBrowserListener listener);
+    /**
    * Show, in both of its forms, allows Gatherer to display a certain URL or file
    * in the HTML pane.
 …
    * @return whether a page has been queued to be rendered.
    */
   public boolean show(String filename);
   /**
+    public boolean show(String filename);
+    /**
    * Show, in both of its forms, allows Gatherer to display a certain URL or file
    * in the HTML pane.
 …
    * @return whether a page has been queued to be rendered.
    */
   public boolean show(GURL url);
   /**
+    public boolean show(GURL url);
+    /**
    * Stop() kills the current rendering.
    * @return whether the rendering was successfully killed.
    */
   public boolean stop();
+    public boolean stop();
+}

trunk/gli/src/org/greenstone/gatherer/gui/combobox/GComboBox.java

-              r4293
+              r4366
  */
 public class GComboBox
      extends JComboBox {
+    extends JComboBox {
      private JTextField text;
+    private JTextField text;
      public GComboBox() {
           super();
           text = (JTextField) this.getEditor().getEditorComponent();
+     }
+    public GComboBox() {
+    super();
+    text = (JTextField) this.getEditor().getEditorComponent();
+    }
      public GComboBox(ComboBoxModel model) {
           super(model);
           text = (JTextField) this.getEditor().getEditorComponent();
+     }
+    public GComboBox(ComboBoxModel model) {
+    super(model);
+    text = (JTextField) this.getEditor().getEditorComponent();
+    }
      public void addDocumentListener(DocumentListener listener) {
           if(text != null) text.getDocument().addDocumentListener(listener);
+     }
+    public void addDocumentListener(DocumentListener listener) {
+    if(text != null) text.getDocument().addDocumentListener(listener);
+    }
      public void addKeyListener(KeyListener listener) {
           if(text != null) text.addKeyListener(listener);
+     }
+    public void addKeyListener(KeyListener listener) {
+    if(text != null) text.addKeyListener(listener);
+    }
      public String getText() {
           if(text != null) {
                 return text.getText();
+          }
           GComboBoxModel model = (GComboBoxModel)this.getModel();
           return (String)model.getSelectedItem();
+     }
+    public String getText() {
+    if(text != null) {
+        return text.getText();
+    }
+    GComboBoxModel model = (GComboBoxModel)this.getModel();
+    return (String)model.getSelectedItem();
+    }
      public void setText(String value) {
           if(text != null) text.setText(value);
+     }
+    public void setText(String value) {
+    if(text != null) text.setText(value);
+    }
      public void removeDocumentListener(DocumentListener listener) {
           if(text != null) text.getDocument().removeDocumentListener(listener);
+     }
+    public void removeDocumentListener(DocumentListener listener) {
+    if(text != null) text.getDocument().removeDocumentListener(listener);
+    }
      public void removeKeyListener(KeyListener listener) {
           if(text != null) text.removeKeyListener(listener);
+     }
+    public void removeKeyListener(KeyListener listener) {
+    if(text != null) text.removeKeyListener(listener);
+    }
+}

trunk/gli/src/org/greenstone/gatherer/gui/combobox/GComboBoxModel.java

-              r4293
+              r4366
 public class GComboBoxModel
      extends AbstractListModel
      implements MutableComboBoxModel {
+    extends AbstractListModel
+    implements MutableComboBoxModel {
      // Data.
      private boolean   isMetadataElement = false;
+    // Data.
+    private boolean   isMetadataElement = false;
      private Hashtable name_to_element   = new Hashtable();
+    private Hashtable name_to_element   = new Hashtable();
      private Object    selected_item     = null;
+    private Object    selected_item     = null;
      private Vector    contents          = new Vector();
+    private Vector    contents          = new Vector();
      public GComboBoxModel() {
+     }
+    public GComboBoxModel() {
+    }
      public GComboBoxModel(Vector contents) {
           this.contents = contents;
           Collections.sort(contents);
+     }
+    public GComboBoxModel(Vector contents) {
+    this.contents = contents;
+    Collections.sort(contents);
+    }
      public GComboBoxModel(Vector elements, boolean isMetadataElement) {
           this.isMetadataElement = isMetadataElement;
           for(int i = 0; i < elements.size(); i++) {
                 ElementWrapper element = (ElementWrapper)elements.get(i);
                 contents.add(element.toString());
                 name_to_element.put(element.toString(), element);
+          }
           Collections.sort(contents);
+     }
+    public GComboBoxModel(Vector elements, boolean isMetadataElement) {
+    this.isMetadataElement = isMetadataElement;
+    for(int i = 0; i < elements.size(); i++) {
+        ElementWrapper element = (ElementWrapper)elements.get(i);
+        contents.add(element.toString());
+        name_to_element.put(element.toString(), element);
+    }
+    Collections.sort(contents);
+    }
      private boolean contains(Vector vector, Object key) {
           for(int i = 0; i < vector.size(); i++) {
                 if(vector.get(i).toString().equals(key.toString())) {
                      return true;
+                }
+          }
           return false;
+     }
+    private boolean contains(Vector vector, Object key) {
+    for(int i = 0; i < vector.size(); i++) {
+        if(vector.get(i).toString().equals(key.toString())) {
+        return true;
+        }
+    }
+    return false;
+    }
      // Methods.
      public void addElement(Object obj) {
           if(!contents.contains(obj)) {
                 contents.add(obj);
                 Collections.sort(contents);
                 refresh();
+          }
+     }
+    // Methods.
+    public void addElement(Object obj) {
+    if(!contents.contains(obj)) {
+        contents.add(obj);
+        Collections.sort(contents);
+        refresh();
+    }
+    }
      public Object getElementAt(int index) {
           return contents.get(index);
+     }
+    public Object getElementAt(int index) {
+    return contents.get(index);
+    }
      public Object getSelectedItem() {
           return selected_item;
+     }
+    public Object getSelectedItem() {
+    return selected_item;
+    }
      public ElementWrapper getSelectedMetadata() {
           if(isMetadataElement) {
                 return (ElementWrapper)name_to_element.get(selected_item);
+          }
           return null;
+     }
+    public ElementWrapper getSelectedMetadata() {
+    if(isMetadataElement) {
+        return (ElementWrapper)name_to_element.get(selected_item);
+    }
+    return null;
+    }
      public int getSize() {
           return contents.size();
+     }
+    public int getSize() {
+    return contents.size();
+    }
      public void insertElementAt(Object obj, int index) {
           contents.add(index, obj);
           fireIntervalAdded(this, index, index);
+     }
+    public void insertElementAt(Object obj, int index) {
+    contents.add(index, obj);
+    fireIntervalAdded(this, index, index);
+    }
      public void refresh() {
           fireContentsChanged(this, 0, getSize());
+     }
+    public void refresh() {
+    fireContentsChanged(this, 0, getSize());
+    }
      public void removeElement(Object obj) {
           int index = contents.indexOf(obj);
           contents.remove(index);
           fireIntervalRemoved(this, index, index);
+     }
+    public void removeElement(Object obj) {
+    int index = contents.indexOf(obj);
+    contents.remove(index);
+    fireIntervalRemoved(this, index, index);
+    }
      public void removeElementAt(int index) {
           contents.remove(index);
           fireIntervalRemoved(this, index, index);
+     }
+    public void removeElementAt(int index) {
+    contents.remove(index);
+    fireIntervalRemoved(this, index, index);
+    }
      public void setSelectedItem(Object obj) {
           selected_item = obj;
           int index = contents.indexOf(obj);
           fireContentsChanged(this, index, index);
+     }
+    public void setSelectedItem(Object obj) {
+    selected_item = obj;
+    int index = contents.indexOf(obj);
+    fireContentsChanged(this, index, index);
+    }
+}

trunk/gli/src/org/greenstone/gatherer/gui/messages/MessageListModel.java

-              r4293
+              r4366
 import org.greenstone.gatherer.util.Utility;
 class MessageListModel
      extends AbstractListModel {
+    extends AbstractListModel {
      Hashtable mappings;
+    Hashtable mappings;
      int current_index;
+    int current_index;
      int current_message;
+    int current_message;
      int sizes[][] = new int[6][4];
+    int sizes[][] = new int[6][4];
      Vector data;
+    Vector data;
      // Contructor
+    // Contructor
     public MessageListModel() {
           current_index = 0;
           current_message = 0;
           data = new Vector();
           mappings = new Hashtable();
           for(int i = 0; i < 6; i++) {
                 for(int j = 0; j < 4; j++) {
                      sizes[i][j] = 0;
+                }
+          }
+    current_index = 0;
+    current_message = 0;
+    data = new Vector();
+    mappings = new Hashtable();
+    for(int i = 0; i < 6; i++) {
+        for(int j = 0; j < 4; j++) {
+        sizes[i][j] = 0;
+        }
+    }
+    }
      // Add a new message in the correct place
+    // Add a new message in the correct place
     public synchronized void add(Message message) {
           // Add the element to the model
           data.add(message);
           // Increment the count for that type of message
           sizes[message.source][message.level]++;
           // An announce to the world that I have changed!
+    // Add the element to the model
+    data.add(message);
+    // Increment the count for that type of message
+    sizes[message.source][message.level]++;
+    // An announce to the world that I have changed!
         fireContentsChanged(this, 0, getSize() - 1);
+    }
 …
     // Return the size of the list
     public int getSize() {
           int size = 0;
           // Each each source...
           for(int i = 0; i < 6; i++) {
+    int size = 0;
+    // Each each source...
+    for(int i = 0; i < 6; i++) {
                 // and each level...
                 for(int j = 0; j < 4; j++) {
                      // If both this source and level are active, add its size
                      /** @todo reenabled
                       * if(gatherer.config.source[i] && gatherer.config.level[j]) {
                       * size = size + sizes[i][j];
                       * }
                       */
+                }
+          }
           return size;
+        for(int j = 0; j < 4; j++) {
+        // If both this source and level are active, add its size
+        /** @todo reenabled
+         * if(gatherer.config.source[i] && gatherer.config.level[j]) {
+         *  size = size + sizes[i][j];
+         * }
+         */
+        }
+    }
+    return size;
+    }
      public int getTotalSize() {
       int size = 0;
           // Each each source...
           for(int i = 0; i < 6; i++) {
+    public int getTotalSize() {
+    int size = 0;
+    // Each each source...
+    for(int i = 0; i < 6; i++) {
                 // and each level...
                 for(int j = 0; j < 4; j++) {
                      size = size + sizes[i][j];
+                }
+          }
           return size;
+     }
+        for(int j = 0; j < 4; j++) {
+        size = size + sizes[i][j];
+        }
+    }
+    return size;
+    }
      public String getSizeStr() {
           return "" + getSize() + "";
+     }
+    public String getSizeStr() {
+    return "" + getSize() + "";
+    }
      public String getTotalSizeStr() {
           return "" + getTotalSize() + "";
+     }
+    public String getTotalSizeStr() {
+    return "" + getTotalSize() + "";
+    }
     // Return a message from the list
     public Object getElementAt( int index ) {
           Integer index_int = new Integer(index);
           // Maybe we've already found this message.
           if(mappings.containsKey(index_int)) {
                 current_message = ((Integer)mappings.get(index_int)).intValue();
+          }
           // Otherwise we're going to have to search for it.
           else {
                 while(index != current_index) {
                      // Asking for an index lower than the one we're at.
                      if(index < current_index) {
                           Message temp;
                           /*
                           do {
                                 current_message--;
                                 temp = (Message)data.get(current_message);
                           } while(!(gatherer.config.source[temp.source] &&
                                      gatherer.config.level[temp.level]));
                           // We are now at a new visible message.
                           */
                           current_index--;
+                     }
                      else {
                           Message temp;
                           /*
                           do {
                                 current_message++;
                                 temp = (Message)data.get(current_message);
                           } while(!(gatherer.config.source[temp.source] &&
                                      gatherer.config.level[temp.level]));
                           // We are now at a new visible message.
                           current_index++;
                           */
+                     }
+                }
+    Integer index_int = new Integer(index);
+    // Maybe we've already found this message.
+    if(mappings.containsKey(index_int)) {
+        current_message = ((Integer)mappings.get(index_int)).intValue();
+    }
+    // Otherwise we're going to have to search for it.
+    else {
+        while(index != current_index) {
+        // Asking for an index lower than the one we're at.
+        if(index < current_index) {
+            Message temp;
+            /*
+              do {
+              current_message--;
+              temp = (Message)data.get(current_message);
+              } while(!(gatherer.config.source[temp.source] &&
+              gatherer.config.level[temp.level]));
+              // We are now at a new visible message.
+            */
+            current_index--;
+        }
+        else {
+            Message temp;
+            /*
+              do {
+              current_message++;
+              temp = (Message)data.get(current_message);
+              } while(!(gatherer.config.source[temp.source] &&
+              gatherer.config.level[temp.level]));
+              // We are now at a new visible message.
+              current_index++;
+            */
+        }
+        }
                 // Now that we've found the blighter, add a mapping so its quicker
                 // next time.
                 mappings.put(new Integer(index),new Integer(current_message));
+          }
           return ((Message)data.get(current_message)).toString();
+        mappings.put(new Integer(index),new Integer(current_message));
+    }
+    return ((Message)data.get(current_message)).toString();
+    }
      public void refresh() {
           if(getSize() > 0) {
                 current_index = 0;
+    public void refresh() {
+    if(getSize() > 0) {
+        current_index = 0;
                 // Find the first message that meets the requirements. Its index 0 y'know.
                 current_message = -1;
                 Message temp;
+        current_message = -1;
+        Message temp;
                 /*
                 do {
                      current_message++;
                      temp = (Message)data.get(current_message);
                 } while(!(gatherer.config.source[temp.source] &&
                              gatherer.config.level[temp.level]));
+                  do {
+                  current_message++;
+                  temp = (Message)data.get(current_message);
+                  } while(!(gatherer.config.source[temp.source] &&
+                  gatherer.config.level[temp.level]));
                 */
                 // Reset mappings.
                 mappings.clear();
                 mappings.put(new Integer(current_index), new Integer(current_message));
+        mappings.clear();
+        mappings.put(new Integer(current_index), new Integer(current_message));
                 // Let everyone who cares know we've changed.
                 fireContentsChanged(this, 0, getSize() - 1);
+          }
           // Else don't bother doning anything on an empty list!
+     }
+        fireContentsChanged(this, 0, getSize() - 1);
+    }
+    // Else don't bother doning anything on an empty list!
+    }
+}

trunk/gli/src/org/greenstone/gatherer/gui/messages/MessageListRenderer.java

-              r4293
+              r4366
  */
 class MessageListRenderer
      extends JLabel
      implements ListCellRenderer {
+    extends JLabel
+    implements ListCellRenderer {
     // Constructor
 …
     // We just reconfigure the JLabel each time we're called.
     public Component getListCellRendererComponent(
          JList list,
           Object value,            // value to display
           int index,               // cell index
           boolean isSelected,      // is the cell selected
           boolean cellHasFocus) {  // the list and the cell have the focus
           // Get the message
           String s = value.toString();
           setText(s);
           // Now parse out the level
           StringTokenizer tokenizer = new StringTokenizer(s);
           // Throw away source.
           tokenizer.nextToken();
           // Now add color details based on level
           String level = tokenizer.nextToken();
           if(level.equals(get("Main"))) {
                 setForeground(Color.black);
           } else if (level.equals(get("Event"))) {
                 setForeground(Color.blue);
           } else if (level.equals(get("Information"))) {
                 setForeground(Color.gray);
           } else {
                 setForeground(Color.red);
+          }
           setEnabled(list.isEnabled());
           setFont(list.getFont());
           return this;
+                          JList list,
+                          Object value,            // value to display
+                          int index,               // cell index
+                          boolean isSelected,      // is the cell selected
+                          boolean cellHasFocus) {  // the list and the cell have the focus
+    // Get the message
+    String s = value.toString();
+    setText(s);
+    // Now parse out the level
+    StringTokenizer tokenizer = new StringTokenizer(s);
+    // Throw away source.
+    tokenizer.nextToken();
+    // Now add color details based on level
+    String level = tokenizer.nextToken();
+    if(level.equals(get("Main"))) {
+        setForeground(Color.black);
+    } else if (level.equals(get("Event"))) {
+        setForeground(Color.blue);
+    } else if (level.equals(get("Information"))) {
+        setForeground(Color.gray);
+    } else {
+        setForeground(Color.red);
+    }
+    setEnabled(list.isEnabled());
+    setFont(list.getFont());
+    return this;
+    }
      private String get(String key) {
           if(key.indexOf('.') == -1) {
                 key = "Level." + key;
+          }
           return Gatherer.dictionary.get(key);
+     }
+    private String get(String key) {
+    if(key.indexOf('.') == -1) {
+        key = "Level." + key;
+    }
+    return Gatherer.dictionary.get(key);
+    }
+}

trunk/gli/src/org/greenstone/gatherer/gui/messages/MessagePane.java

-              r4293
+              r4366
  */
 public class MessagePane
      extends JPanel
+    extends JPanel
     implements ActionListener {
      GridBagConstraints grid_constraints = null;
      GridBagLayout grid_layout = null;
      JButton save_messages = null;
      JLabel level_label = null;
      JLabel message_count = null;
      JLabel source_label = null;
      JPanel central_pane = null;
      JPanel corner_pane = null;
      JPanel count_pane = null;
      JPanel horizontal_pane = null;
      JPanel level_pane = null;
      JPanel source_pane = null;
      JPanel vertical_pane = null;
      JScrollPane scroll_pane = null;
      JToggleButton level_event = null;
      JToggleButton level_error = null;
      JToggleButton level_information = null;
      JToggleButton level_main = null;
      JToggleButton source_browser = null;
      JToggleButton source_build = null;
      JToggleButton source_general = null;
      JToggleButton source_mirroring = null;
      JToggleButton source_metaedit = null;
      JToggleButton source_session = null;
      JList message_list = null;
      MessageListModel model = null;
      MessageListRenderer renderer = null;
      String args[];
      public MessagePane() {
+     }
      public void display() {
           // Setup main layout managers
           grid_layout = new GridBagLayout();
           grid_constraints = new GridBagConstraints();
           this.setLayout(grid_layout);
           // Vertical Buttons
           source_pane = new JPanel(new BorderLayout());
           source_pane.setBorder(BorderFactory.createEmptyBorder(5,5,5,3));
           vertical_pane = new JPanel(new GridLayout(6,1));
           Gatherer.println("\tCreating source_label");
           source_label = new JLabel(get("Source"));
           source_label.setHorizontalAlignment(JLabel.CENTER);
           Gatherer.println("\tCreating source_general");
           source_general = new JToggleButton(get("General"), Gatherer.config.get("messages.source_general", false));
           source_general.setIcon(Utility.OFF_ICON);
           source_general.setSelectedIcon(Utility.ON_ICON);
           source_general.setHorizontalTextPosition(JToggleButton.CENTER);
           source_general.setVerticalTextPosition(JToggleButton.BOTTOM);
           source_general.addActionListener(this);
           Gatherer.println("\tCreating source_browser");
           source_browser = new JToggleButton(get("Browser"), Gatherer.config.get("messages.source_browser", false));
           source_browser.setIcon(Utility.OFF_ICON);
           source_browser.setSelectedIcon(Utility.ON_ICON);
           source_browser.setHorizontalTextPosition(JToggleButton.CENTER);
           source_browser.setVerticalTextPosition(JToggleButton.BOTTOM);
           source_browser.addActionListener(this);
           Gatherer.println("\tCreating source_mirroring");
           source_mirroring = new JToggleButton(get("Mirroring"), Gatherer.config.get("messages.source_mirroring", false));
           source_mirroring.setIcon(Utility.OFF_ICON);
           source_mirroring.setSelectedIcon(Utility.ON_ICON);
           source_mirroring.setHorizontalTextPosition(JToggleButton.CENTER);
           source_mirroring.setVerticalTextPosition(JToggleButton.BOTTOM);
           source_mirroring.addActionListener(this);
           Gatherer.println("\tCreating source_session");
           source_session = new JToggleButton(get("Session"), Gatherer.config.get("messages.source_session", false));
           source_session.setIcon(Utility.OFF_ICON);
           source_session.setSelectedIcon(Utility.ON_ICON);
          source_session.setHorizontalTextPosition(JToggleButton.CENTER);
           source_session.setVerticalTextPosition(JToggleButton.BOTTOM);
           source_session.addActionListener(this);
           Gatherer.println("\tCreating source_metaedit");
           source_metaedit = new JToggleButton(get("Metaedit"), Gatherer.config.get("messages.source_metaedit", false));
           source_metaedit.setIcon(Utility.OFF_ICON);
           source_metaedit.setSelectedIcon(Utility.ON_ICON);
           source_metaedit.setHorizontalTextPosition(JToggleButton.CENTER);
           source_metaedit.setVerticalTextPosition(JToggleButton.BOTTOM);
           source_metaedit.addActionListener(this);
           Gatherer.println("\tCreating source_build");
           source_build = new JToggleButton(get("Build"), Gatherer.config.get("messages.source_build", false));
           source_build.setIcon(Utility.OFF_ICON);
           source_build.setSelectedIcon(Utility.ON_ICON);
           source_build.setHorizontalTextPosition(JToggleButton.CENTER);
           source_build.setVerticalTextPosition(JToggleButton.BOTTOM);
           source_build.addActionListener(this);
           source_pane.add(source_label, BorderLayout.NORTH);
           vertical_pane.add(source_general);
           vertical_pane.add(source_browser);
           vertical_pane.add(source_mirroring);
           vertical_pane.add(source_session);
           vertical_pane.add(source_metaedit);
           vertical_pane.add(source_build);
           source_pane.add(vertical_pane, BorderLayout.CENTER);
           // Central pane
           central_pane = new JPanel(new BorderLayout());
           Gatherer.println("\tCreating message_list");
           model = new MessageListModel();
           renderer = new MessageListRenderer();
           message_list = new JList();
           message_list.setModel(model);
           message_list.setCellRenderer(renderer);
           scroll_pane = new JScrollPane(message_list);
           central_pane.add(scroll_pane, BorderLayout.CENTER);
           Gatherer.println("\tCreating message_count");
           count_pane = new JPanel(new BorderLayout());
           args = new String[2];
           args[0] = model.getSizeStr();
           args[1] = model.getTotalSizeStr();
           message_count = new JLabel(get("Message_Count",args));
           message_count.setHorizontalAlignment(JLabel.RIGHT);
           central_pane.add(scroll_pane, BorderLayout.CENTER);
           central_pane.add(message_count, BorderLayout.SOUTH);
           // Corner area
           corner_pane = new JPanel(new BorderLayout());
           corner_pane.setBorder(BorderFactory.createEmptyBorder(3,5,5,5));
           Gatherer.println("\tCreating save_message");
           save_messages = new JButton(get("Save_Messages"),
                                                 new ImageIcon(Utility.RES_DIR+"save.gif"));
           save_messages.addActionListener(this);
           corner_pane.add(save_messages, BorderLayout.CENTER);
           // Horizontal buttons.
           level_pane = new JPanel(new BorderLayout());
           horizontal_pane = new JPanel(new GridLayout(1,4));
           Gatherer.println("\tCreating level_label");
           level_label = new JLabel(get("Level"));
           level_label.setHorizontalAlignment(JLabel.CENTER);
           Gatherer.println("\tCreating level_main");
           level_main = new JToggleButton(get("Main"), Gatherer.config.get("messages.level_main", false));
           level_main.setIcon(Utility.OFF_ICON);
           level_main.setSelectedIcon(Utility.ON_ICON);
           level_main.addActionListener(this);
           Gatherer.println("\tCreating level_event");
           level_event = new JToggleButton(get("Event"), Gatherer.config.get("messages.level_event", false));
           level_event.setIcon(Utility.OFF_ICON);
           level_event.setSelectedIcon(Utility.ON_ICON);
           level_event.addActionListener(this);
           Gatherer.println("\tCreating level_information");
           level_information = new JToggleButton(get("Information"), Gatherer.config.get("messages.level_information", false));
           level_information.setIcon(Utility.OFF_ICON);
           level_information.setSelectedIcon(Utility.ON_ICON);
           level_information.addActionListener(this);
           Gatherer.println("\tCreating level_error");
           level_error = new JToggleButton(get("Error"), Gatherer.config.get("messages.level_error", false));
           level_error.setIcon(Utility.OFF_ICON);
           level_error.setSelectedIcon(Utility.ON_ICON);
           level_error.addActionListener(this);
           level_pane.add(level_label, BorderLayout.NORTH);
           horizontal_pane.add(level_main);
           horizontal_pane.add(level_event);
           horizontal_pane.add(level_information);
           horizontal_pane.add(level_error);
           level_pane.add(horizontal_pane, BorderLayout.CENTER);
           // Terrifying gridbag layout
           grid_constraints.fill = GridBagConstraints.BOTH;
           grid_layout.setConstraints(source_pane, grid_constraints);
           this.add(source_pane);
           grid_constraints.weightx = 1.0;
           grid_constraints.weighty = 1.0;
           grid_constraints.gridwidth = GridBagConstraints.REMAINDER;
           grid_layout.setConstraints(central_pane, grid_constraints);
           this.add(central_pane);
           grid_constraints.weightx = 0.0;
           grid_constraints.weighty = 0.0;
           grid_constraints.gridwidth = 1;
           grid_layout.setConstraints(corner_pane, grid_constraints);
           this.add(corner_pane);
           grid_constraints.gridwidth = GridBagConstraints.REMAINDER;
           grid_layout.setConstraints(level_pane, grid_constraints);
           this.add(level_pane);
+     }
      public void actionPerformed(ActionEvent event) {
           Object source = event.getSource();
           // Eventually this will dump the messages to a text file, but for now
           // I'm using it in testing.
           if(source == save_messages) {
                 for(int i = 0; i < 20; i++) {
                      model.add(Message.random());
                      message_list.ensureIndexIsVisible(model.getSize() - 1);
+                }
+          }
           // We've been asked to toggle whether we show general messages.
           else if(source == source_general) {
                 // Toggle config setting
                 Gatherer.config.set("messages.source_general", false, !Gatherer.config.get("messages.source_general", false));
                 // Inform model something has changed.
                 model.refresh();
                 message_list.ensureIndexIsVisible(model.getSize() - 1);
+          }
           // We've been asked to toggle whether we show browser messages.
           else if(source == source_browser) {
                 // Toggle config setting
                 Gatherer.config.set("messages.source_browser", false, !Gatherer.config.get("messages.source_browser", false));
                 // Inform model something has changed.
                 model.refresh();
                 message_list.ensureIndexIsVisible(model.getSize() - 1);
+          }
           // We've been asked to toggle whether we show general messages.
           else if(source == source_mirroring) {
                 // Toggle config setting
                 Gatherer.config.set("messages.source_mirroring", false, !Gatherer.config.get("messages.source_mirroring", false));
                 // Inform model something has changed.
                 model.refresh();
                 message_list.ensureIndexIsVisible(model.getSize() - 1);
+          }
           // We've been asked to toggle whether we show session messages.
           else if(source == source_session) {
                 // Toggle config setting
                 Gatherer.config.set("messages.source_session", false, !Gatherer.config.get("messages.source_session", false));
                 // Inform model something has changed.
                 model.refresh();
                 message_list.ensureIndexIsVisible(model.getSize() - 1);
+          }
           // We've been asked to toggle whether we show metaedit messages.
           else if(source == source_metaedit) {
                 // Toggle config setting
                 Gatherer.config.set("messages.source_metaedit", false, !Gatherer.config.get("messages.source_metaedit", false));
                 // Inform model something has changed.
                 model.refresh();
                 message_list.ensureIndexIsVisible(model.getSize() - 1);
+          }
           // We've been asked to toggle whether we show build messages.
           else if(source == source_build) {
                 // Toggle config setting
                 Gatherer.config.set("messages.source_build", false, !Gatherer.config.get("messages.source_build", false));
                 // Inform model something has changed.
                 model.refresh();
                 message_list.ensureIndexIsVisible(model.getSize() - 1);
+          }
           // We've been asked to toggle whether we show main level messages.
           else if(source == level_main) {
                 // Toggle config setting
                 Gatherer.config.set("messages.level_main", false, !Gatherer.config.get("messages.level_main", false));
                 // Inform model something has changed.
                 model.refresh();
                 message_list.ensureIndexIsVisible(model.getSize() - 1);
+          }
           // We've been asked to toggle whether we show event level messages.
           else if(source == level_event) {
                 // Toggle config setting
                 Gatherer.config.set("messages.level_event", false, !Gatherer.config.get("messages.level_event", false));
                 // Inform model something has changed.
                 model.refresh();
                 message_list.ensureIndexIsVisible(model.getSize() - 1);
+          }
           // We've been asked to toggle whether we show information level messages.
           else if(source == level_information) {
                 // Toggle config setting
                 Gatherer.config.set("messages.level_information", false, !Gatherer.config.get("messages.level_information", false));
                 // Inform model something has changed.
                 model.refresh();
                 message_list.ensureIndexIsVisible(model.getSize() - 1);
+          }
           // We've been asked to toggle whether we show error level messages.
           else if(source == level_error) {
                 // Toggle config setting
                 Gatherer.config.set("messages.level_error", false, !Gatherer.config.get("messages.level_error", false));
                 // Inform model something has changed.
                 model.refresh();
                 message_list.ensureIndexIsVisible(model.getSize() - 1);
+          }
           // Pretty much no matter what happens we need to get the new size
           args = new String[2];
           args[0] = model.getSizeStr();
           args[1] = model.getTotalSizeStr();
           message_count.setText(get("Message_Count",args));
+     }
      /** The callback for the message listener. Here all of the messages are
       * displayed onto the list.
       * @param message The Message to be displayed.
       */
      public void show(Message message) {
           model.add(message);
           message_list.ensureIndexIsVisible(model.getSize() - 1);
+     }
      private String get(String key) {
           return get(key, null);
+     }
      private String get(String key, String args[]) {
           if(key.indexOf('.') == -1) {
                 key = "Messages." + key;
+          }
           return Gatherer.dictionary.get(key, args);
+     }
+    GridBagConstraints grid_constraints = null;
+    GridBagLayout grid_layout = null;
+    JButton save_messages = null;
+    JLabel level_label = null;
+    JLabel message_count = null;
+    JLabel source_label = null;
+    JPanel central_pane = null;
+    JPanel corner_pane = null;
+    JPanel count_pane = null;
+    JPanel horizontal_pane = null;
+    JPanel level_pane = null;
+    JPanel source_pane = null;
+    JPanel vertical_pane = null;
+    JScrollPane scroll_pane = null;
+    JToggleButton level_event = null;
+    JToggleButton level_error = null;
+    JToggleButton level_information = null;
+    JToggleButton level_main = null;
+    JToggleButton source_browser = null;
+    JToggleButton source_build = null;
+    JToggleButton source_general = null;
+    JToggleButton source_mirroring = null;
+    JToggleButton source_metaedit = null;
+    JToggleButton source_session = null;
+    JList message_list = null;
+    MessageListModel model = null;
+    MessageListRenderer renderer = null;
+    String args[];
+    public MessagePane() {
+    }
+    public void display() {
+    // Setup main layout managers
+    grid_layout = new GridBagLayout();
+    grid_constraints = new GridBagConstraints();
+    this.setLayout(grid_layout);
+    // Vertical Buttons
+    source_pane = new JPanel(new BorderLayout());
+    source_pane.setBorder(BorderFactory.createEmptyBorder(5,5,5,3));
+    vertical_pane = new JPanel(new GridLayout(6,1));
+    Gatherer.println("\tCreating source_label");
+    source_label = new JLabel(get("Source"));
+    source_label.setHorizontalAlignment(JLabel.CENTER);
+    Gatherer.println("\tCreating source_general");
+    source_general = new JToggleButton(get("General"), Gatherer.config.get("messages.source_general", false));
+    source_general.setIcon(Utility.OFF_ICON);
+    source_general.setSelectedIcon(Utility.ON_ICON);
+    source_general.setHorizontalTextPosition(JToggleButton.CENTER);
+    source_general.setVerticalTextPosition(JToggleButton.BOTTOM);
+    source_general.addActionListener(this);
+    Gatherer.println("\tCreating source_browser");
+    source_browser = new JToggleButton(get("Browser"), Gatherer.config.get("messages.source_browser", false));
+    source_browser.setIcon(Utility.OFF_ICON);
+    source_browser.setSelectedIcon(Utility.ON_ICON);
+    source_browser.setHorizontalTextPosition(JToggleButton.CENTER);
+    source_browser.setVerticalTextPosition(JToggleButton.BOTTOM);
+    source_browser.addActionListener(this);
+    Gatherer.println("\tCreating source_mirroring");
+    source_mirroring = new JToggleButton(get("Mirroring"), Gatherer.config.get("messages.source_mirroring", false));
+    source_mirroring.setIcon(Utility.OFF_ICON);
+    source_mirroring.setSelectedIcon(Utility.ON_ICON);
+    source_mirroring.setHorizontalTextPosition(JToggleButton.CENTER);
+    source_mirroring.setVerticalTextPosition(JToggleButton.BOTTOM);
+    source_mirroring.addActionListener(this);
+    Gatherer.println("\tCreating source_session");
+    source_session = new JToggleButton(get("Session"), Gatherer.config.get("messages.source_session", false));
+    source_session.setIcon(Utility.OFF_ICON);
+    source_session.setSelectedIcon(Utility.ON_ICON);
+    source_session.setHorizontalTextPosition(JToggleButton.CENTER);
+    source_session.setVerticalTextPosition(JToggleButton.BOTTOM);
+    source_session.addActionListener(this);
+    Gatherer.println("\tCreating source_metaedit");
+    source_metaedit = new JToggleButton(get("Metaedit"), Gatherer.config.get("messages.source_metaedit", false));
+    source_metaedit.setIcon(Utility.OFF_ICON);
+    source_metaedit.setSelectedIcon(Utility.ON_ICON);
+    source_metaedit.setHorizontalTextPosition(JToggleButton.CENTER);
+    source_metaedit.setVerticalTextPosition(JToggleButton.BOTTOM);
+    source_metaedit.addActionListener(this);
+    Gatherer.println("\tCreating source_build");
+    source_build = new JToggleButton(get("Build"), Gatherer.config.get("messages.source_build", false));
+    source_build.setIcon(Utility.OFF_ICON);
+    source_build.setSelectedIcon(Utility.ON_ICON);
+    source_build.setHorizontalTextPosition(JToggleButton.CENTER);
+    source_build.setVerticalTextPosition(JToggleButton.BOTTOM);
+    source_build.addActionListener(this);
+    source_pane.add(source_label, BorderLayout.NORTH);
+    vertical_pane.add(source_general);
+    vertical_pane.add(source_browser);
+    vertical_pane.add(source_mirroring);
+    vertical_pane.add(source_session);
+    vertical_pane.add(source_metaedit);
+    vertical_pane.add(source_build);
+    source_pane.add(vertical_pane, BorderLayout.CENTER);
+    // Central pane
+    central_pane = new JPanel(new BorderLayout());
+    Gatherer.println("\tCreating message_list");
+    model = new MessageListModel();
+    renderer = new MessageListRenderer();
+    message_list = new JList();
+    message_list.setModel(model);
+    message_list.setCellRenderer(renderer);
+    scroll_pane = new JScrollPane(message_list);
+    central_pane.add(scroll_pane, BorderLayout.CENTER);
+    Gatherer.println("\tCreating message_count");
+    count_pane = new JPanel(new BorderLayout());
+    args = new String[2];
+    args[0] = model.getSizeStr();
+    args[1] = model.getTotalSizeStr();
+    message_count = new JLabel(get("Message_Count",args));
+    message_count.setHorizontalAlignment(JLabel.RIGHT);
+    central_pane.add(scroll_pane, BorderLayout.CENTER);
+    central_pane.add(message_count, BorderLayout.SOUTH);
+    // Corner area
+    corner_pane = new JPanel(new BorderLayout());
+    corner_pane.setBorder(BorderFactory.createEmptyBorder(3,5,5,5));
+    Gatherer.println("\tCreating save_message");
+    save_messages = new JButton(get("Save_Messages"),
+                    new ImageIcon(Utility.RES_DIR+"save.gif"));
+    save_messages.addActionListener(this);
+    corner_pane.add(save_messages, BorderLayout.CENTER);
+    // Horizontal buttons.
+    level_pane = new JPanel(new BorderLayout());
+    horizontal_pane = new JPanel(new GridLayout(1,4));
+    Gatherer.println("\tCreating level_label");
+    level_label = new JLabel(get("Level"));
+    level_label.setHorizontalAlignment(JLabel.CENTER);
+    Gatherer.println("\tCreating level_main");
+    level_main = new JToggleButton(get("Main"), Gatherer.config.get("messages.level_main", false));
+    level_main.setIcon(Utility.OFF_ICON);
+    level_main.setSelectedIcon(Utility.ON_ICON);
+    level_main.addActionListener(this);
+    Gatherer.println("\tCreating level_event");
+    level_event = new JToggleButton(get("Event"), Gatherer.config.get("messages.level_event", false));
+    level_event.setIcon(Utility.OFF_ICON);
+    level_event.setSelectedIcon(Utility.ON_ICON);
+    level_event.addActionListener(this);
+    Gatherer.println("\tCreating level_information");
+    level_information = new JToggleButton(get("Information"), Gatherer.config.get("messages.level_information", false));
+    level_information.setIcon(Utility.OFF_ICON);
+    level_information.setSelectedIcon(Utility.ON_ICON);
+    level_information.addActionListener(this);
+    Gatherer.println("\tCreating level_error");
+    level_error = new JToggleButton(get("Error"), Gatherer.config.get("messages.level_error", false));
+    level_error.setIcon(Utility.OFF_ICON);
+    level_error.setSelectedIcon(Utility.ON_ICON);
+    level_error.addActionListener(this);
+    level_pane.add(level_label, BorderLayout.NORTH);
+    horizontal_pane.add(level_main);
+    horizontal_pane.add(level_event);
+    horizontal_pane.add(level_information);
+    horizontal_pane.add(level_error);
+    level_pane.add(horizontal_pane, BorderLayout.CENTER);
+    // Terrifying gridbag layout
+    grid_constraints.fill = GridBagConstraints.BOTH;
+    grid_layout.setConstraints(source_pane, grid_constraints);
+    this.add(source_pane);
+    grid_constraints.weightx = 1.0;
+    grid_constraints.weighty = 1.0;
+    grid_constraints.gridwidth = GridBagConstraints.REMAINDER;
+    grid_layout.setConstraints(central_pane, grid_constraints);
+    this.add(central_pane);
+    grid_constraints.weightx = 0.0;
+    grid_constraints.weighty = 0.0;
+    grid_constraints.gridwidth = 1;
+    grid_layout.setConstraints(corner_pane, grid_constraints);
+    this.add(corner_pane);
+    grid_constraints.gridwidth = GridBagConstraints.REMAINDER;
+    grid_layout.setConstraints(level_pane, grid_constraints);
+    this.add(level_pane);
+    }
+    public void actionPerformed(ActionEvent event) {
+    Object source = event.getSource();
+    // Eventually this will dump the messages to a text file, but for now
+    // I'm using it in testing.
+    if(source == save_messages) {
+        for(int i = 0; i < 20; i++) {
+        model.add(Message.random());
+        message_list.ensureIndexIsVisible(model.getSize() - 1);
+        }
+    }
+    // We've been asked to toggle whether we show general messages.
+    else if(source == source_general) {
+                // Toggle config setting
+        Gatherer.config.set("messages.source_general", false, !Gatherer.config.get("messages.source_general", false));
+                // Inform model something has changed.
+        model.refresh();
+        message_list.ensureIndexIsVisible(model.getSize() - 1);
+    }
+    // We've been asked to toggle whether we show browser messages.
+    else if(source == source_browser) {
+                // Toggle config setting
+        Gatherer.config.set("messages.source_browser", false, !Gatherer.config.get("messages.source_browser", false));
+                // Inform model something has changed.
+        model.refresh();
+        message_list.ensureIndexIsVisible(model.getSize() - 1);
+    }
+    // We've been asked to toggle whether we show general messages.
+    else if(source == source_mirroring) {
+                // Toggle config setting
+        Gatherer.config.set("messages.source_mirroring", false, !Gatherer.config.get("messages.source_mirroring", false));
+                // Inform model something has changed.
+        model.refresh();
+        message_list.ensureIndexIsVisible(model.getSize() - 1);
+    }
+    // We've been asked to toggle whether we show session messages.
+    else if(source == source_session) {
+                // Toggle config setting
+        Gatherer.config.set("messages.source_session", false, !Gatherer.config.get("messages.source_session", false));
+                // Inform model something has changed.
+        model.refresh();
+        message_list.ensureIndexIsVisible(model.getSize() - 1);
+    }
+    // We've been asked to toggle whether we show metaedit messages.
+    else if(source == source_metaedit) {
+                // Toggle config setting
+        Gatherer.config.set("messages.source_metaedit", false, !Gatherer.config.get("messages.source_metaedit", false));
+                // Inform model something has changed.
+        model.refresh();
+        message_list.ensureIndexIsVisible(model.getSize() - 1);
+    }
+    // We've been asked to toggle whether we show build messages.
+    else if(source == source_build) {
+                // Toggle config setting
+        Gatherer.config.set("messages.source_build", false, !Gatherer.config.get("messages.source_build", false));
+                // Inform model something has changed.
+        model.refresh();
+        message_list.ensureIndexIsVisible(model.getSize() - 1);
+    }
+    // We've been asked to toggle whether we show main level messages.
+    else if(source == level_main) {
+                // Toggle config setting
+        Gatherer.config.set("messages.level_main", false, !Gatherer.config.get("messages.level_main", false));
+                // Inform model something has changed.
+        model.refresh();
+        message_list.ensureIndexIsVisible(model.getSize() - 1);
+    }
+    // We've been asked to toggle whether we show event level messages.
+    else if(source == level_event) {
+                // Toggle config setting
+        Gatherer.config.set("messages.level_event", false, !Gatherer.config.get("messages.level_event", false));
+                // Inform model something has changed.
+        model.refresh();
+        message_list.ensureIndexIsVisible(model.getSize() - 1);
+    }
+    // We've been asked to toggle whether we show information level messages.
+    else if(source == level_information) {
+                // Toggle config setting
+        Gatherer.config.set("messages.level_information", false, !Gatherer.config.get("messages.level_information", false));
+                // Inform model something has changed.
+        model.refresh();
+        message_list.ensureIndexIsVisible(model.getSize() - 1);
+    }
+    // We've been asked to toggle whether we show error level messages.
+    else if(source == level_error) {
+                // Toggle config setting
+        Gatherer.config.set("messages.level_error", false, !Gatherer.config.get("messages.level_error", false));
+                // Inform model something has changed.
+        model.refresh();
+        message_list.ensureIndexIsVisible(model.getSize() - 1);
+    }
+    // Pretty much no matter what happens we need to get the new size
+    args = new String[2];
+    args[0] = model.getSizeStr();
+    args[1] = model.getTotalSizeStr();
+    message_count.setText(get("Message_Count",args));
+    }
+    /** The callback for the message listener. Here all of the messages are
+     * displayed onto the list.
+     * @param message The Message to be displayed.
+     */
+    public void show(Message message) {
+    model.add(message);
+    message_list.ensureIndexIsVisible(model.getSize() - 1);
+    }
+    private String get(String key) {
+    return get(key, null);
+    }
+    private String get(String key, String args[]) {
+    if(key.indexOf('.') == -1) {
+        key = "Messages." + key;
+    }
+    return Gatherer.dictionary.get(key, args);
+    }
+}

trunk/gli/src/org/greenstone/gatherer/gui/metaaudit/Autofilter.java

-              r4293
+              r4366
  */
 public class Autofilter {
      /** <i>true</i> if the filter should be applied, <i>false</i> to indicate the filter is turned off. */
      public boolean active;
      /** <i>true</i> if the matching for the first expression should be case sensitive, <i>false</i> otherwise. */
      public boolean casesense_one;
      /** <i>true</i> if the matching for the second expression should be case sensitive, <i>false</i> otherwise. */
      public boolean casesense_two;
      /** Used to determine the operation intended when applying two filters, and set using the values of the OPERATION_TYPE enumeration. */
      public boolean operation;
      /** Used to determine how the column this filter is applied to should be sorted, and set using the values of the SORT_TYPE enumeration. */
      public boolean sort;
      /** The method to be used for the first filter expression, set from the values of the METHOD_LIST enumeration. */
      public int method_one;
      /** The method to be used for the second filter expression, set from the values of the METHOD_LIST enumeration. */
      public int method_two;
      /** The value to be matched against for the first expression. */
      public String value_one;
      /** The value to be matched against for the second expression. */
      public String value_two;
      /** An element of the SORT_TYPE enumeration, indicates lowest to highest value column ordering. */
      public static final boolean ASCENDING = true;
      /** An element of the OPERATION_TYPE enumeration, indicates that both filter expressions must be met (conjunction). */
      public static final boolean AND = true;
      /** An element of the SORT_TYPE enumeration, indicates highest to lowest value column ordering. */
      public static final boolean DESCENDING = false;
      /** An element of the OPERATION_TYPE enumeration, indicates that either (or both) filter expressions must be met (disjunction). */
      public static final boolean OR = false;
      /** An enumeration of symbolic names of various matching methods. */
      public static final String METHOD_LIST[] = {"eqeq", "!eq", "<", "<eq", ">", ">eq", "^", "!^", "$", "!$", "?", "!?"};
      /** Default Constructor. */
      public Autofilter() {
           operation = OR;
           sort = ASCENDING;
+     }
      /** Determine if this filter is currently active.
       * @return <i>true</i> if it is active, <i>false</i> otherwise.
       */
      public boolean active() {
           return active;
+     }
      /** Determine if this list of values (for a certain cell) passes the filter.
       * @param values An <strong>ArrayList</strong> of values sourced from a single cell in the associated column.
       * @return <i>true</i> if the values match and should be displayed, <i>false</i> otherwise.
       */
      public boolean filter(ArrayList values) {
           boolean result = false;
           if(value_one != null) {
                 result = filter(values, method_one, value_one, casesense_one);
                 if(result) {
                      if(operation == AND && value_two != null) {
                           result = filter(values, method_two, value_two, casesense_two);
+                     }
+                }
                 else if(operation == OR && value_two != null) {
                      result = filter(values, method_two, value_two, casesense_two);
+                }
+          }
           return result;
+     }
      /** Set the current activity state of this filter.
       * @param active The new state of this filter, <i>true</i> to activate, <i>false</i> otherwise.
       */
      public void setActive(boolean active) {
           this.active = active;
+     }
      /** Set one of the filter expressions using the given information.
       * @param number The number of the filter you wish to set as an <i>int</i>. Either 1 or 2.
       * @param method An <i>int</i> indicating the method to be used when matching.
       * @param value The <strong>String</strong> to be matched against.
       * @param casesense <i>true</i> if this expression should be case sensitive, <i>false</i> otherwise.
       */
      public void setFilter(int number, int method, String value, boolean casesense) {
           if(!casesense && value != null) {
                 value = value.toLowerCase();
+          }
           if(number == 1) {
                 casesense_one = casesense;
                 method_one = method;
                 value_one = value;
+          }
           else {
                 casesense_two = casesense;
                 method_two = method;
                 value_two = value;
+          }
+     }
      /** Set the operation to be used to join the two filters (if a second filter is set).
       * @param operation <i>true</i> for conjunct filters, <i>false</i> for disjunct.
       */
      public void setOperation(boolean operation) {
           this.operation = operation;
+     }
      /** Set the sort order of this column.
       * @param sort <i>true</i> for ascending sort, <i>false</i> for descending.
       */
      public void setSort(boolean sort) {
           this.sort = sort;
+     }
      /** Decide whether a row should be displayed or filtered. The result depends on the selector set with setFilterType.
       * @param values An <strong>ArrayList</strong> of values to be checked against the filter.
       * @param method The method of matching to be used, as an <i>int</i>.
       * @param target The <strong>String</Strong> to match against.
       * @param casesense <i>true</i> if the match is to be case sensitive, <i>false</i> otherwise.
       * @return <i>true</i> to display the row, <i>false</i> to hide it.
       */
      public boolean filter(ArrayList values, int method, String target, boolean casesense) {
           boolean result = false;
           // There are several special cases when the filter always returns turn, such as when the target is the wildcard character.
           if(target == null || target.length() == 0 || target.equals("*")) {
                 result = true;
+          }
           else {
+    /** <i>true</i> if the filter should be applied, <i>false</i> to indicate the filter is turned off. */
+    public boolean active;
+    /** <i>true</i> if the matching for the first expression should be case sensitive, <i>false</i> otherwise. */
+    public boolean casesense_one;
+    /** <i>true</i> if the matching for the second expression should be case sensitive, <i>false</i> otherwise. */
+    public boolean casesense_two;
+    /** Used to determine the operation intended when applying two filters, and set using the values of the OPERATION_TYPE enumeration. */
+    public boolean operation;
+    /** Used to determine how the column this filter is applied to should be sorted, and set using the values of the SORT_TYPE enumeration. */
+    public boolean sort;
+    /** The method to be used for the first filter expression, set from the values of the METHOD_LIST enumeration. */
+    public int method_one;
+    /** The method to be used for the second filter expression, set from the values of the METHOD_LIST enumeration. */
+    public int method_two;
+    /** The value to be matched against for the first expression. */
+    public String value_one;
+    /** The value to be matched against for the second expression. */
+    public String value_two;
+    /** An element of the SORT_TYPE enumeration, indicates lowest to highest value column ordering. */
+    public static final boolean ASCENDING = true;
+    /** An element of the OPERATION_TYPE enumeration, indicates that both filter expressions must be met (conjunction). */
+    public static final boolean AND = true;
+    /** An element of the SORT_TYPE enumeration, indicates highest to lowest value column ordering. */
+    public static final boolean DESCENDING = false;
+    /** An element of the OPERATION_TYPE enumeration, indicates that either (or both) filter expressions must be met (disjunction). */
+    public static final boolean OR = false;
+    /** An enumeration of symbolic names of various matching methods. */
+    public static final String METHOD_LIST[] = {"eqeq", "!eq", "<", "<eq", ">", ">eq", "^", "!^", "$", "!$", "?", "!?"};
+    /** Default Constructor. */
+    public Autofilter() {
+    operation = OR;
+    sort = ASCENDING;
+    }
+    /** Determine if this filter is currently active.
+     * @return <i>true</i> if it is active, <i>false</i> otherwise.
+     */
+    public boolean active() {
+    return active;
+    }
+    /** Determine if this list of values (for a certain cell) passes the filter.
+     * @param values An <strong>ArrayList</strong> of values sourced from a single cell in the associated column.
+     * @return <i>true</i> if the values match and should be displayed, <i>false</i> otherwise.
+     */
+    public boolean filter(ArrayList values) {
+    boolean result = false;
+    if(value_one != null) {
+        result = filter(values, method_one, value_one, casesense_one);
+        if(result) {
+        if(operation == AND && value_two != null) {
+            result = filter(values, method_two, value_two, casesense_two);
+        }
+        }
+        else if(operation == OR && value_two != null) {
+        result = filter(values, method_two, value_two, casesense_two);
+        }
+    }
+    return result;
+    }
+    /** Set the current activity state of this filter.
+     * @param active The new state of this filter, <i>true</i> to activate, <i>false</i> otherwise.
+     */
+    public void setActive(boolean active) {
+    this.active = active;
+    }
+    /** Set one of the filter expressions using the given information.
+     * @param number The number of the filter you wish to set as an <i>int</i>. Either 1 or 2.
+     * @param method An <i>int</i> indicating the method to be used when matching.
+     * @param value The <strong>String</strong> to be matched against.
+     * @param casesense <i>true</i> if this expression should be case sensitive, <i>false</i> otherwise.
+     */
+    public void setFilter(int number, int method, String value, boolean casesense) {
+    if(!casesense && value != null) {
+        value = value.toLowerCase();
+    }
+    if(number == 1) {
+        casesense_one = casesense;
+        method_one = method;
+        value_one = value;
+    }
+    else {
+        casesense_two = casesense;
+        method_two = method;
+        value_two = value;
+    }
+    }
+    /** Set the operation to be used to join the two filters (if a second filter is set).
+     * @param operation <i>true</i> for conjunct filters, <i>false</i> for disjunct.
+     */
+    public void setOperation(boolean operation) {
+    this.operation = operation;
+    }
+    /** Set the sort order of this column.
+     * @param sort <i>true</i> for ascending sort, <i>false</i> for descending.
+     */
+    public void setSort(boolean sort) {
+    this.sort = sort;
+    }
+    /** Decide whether a row should be displayed or filtered. The result depends on the selector set with setFilterType.
+     * @param values An <strong>ArrayList</strong> of values to be checked against the filter.
+     * @param method The method of matching to be used, as an <i>int</i>.
+     * @param target The <strong>String</Strong> to match against.
+     * @param casesense <i>true</i> if the match is to be case sensitive, <i>false</i> otherwise.
+     * @return <i>true</i> to display the row, <i>false</i> to hide it.
+     */
+    public boolean filter(ArrayList values, int method, String target, boolean casesense) {
+    boolean result = false;
+    // There are several special cases when the filter always returns turn, such as when the target is the wildcard character.
+    if(target == null || target.length() == 0 || target.equals("*")) {
+        result = true;
+    }
+    else {
                 // For each value in the list...
                 for(int i = 0; i < values.size(); i++) {
                      boolean pass;
                      String source;
                      // Account for case sensitivity.
                      if(casesense) {
                           source = values.get(i).toString();
+                     }
                      else {
                           source = values.get(i).toString().toLowerCase();
+                     }
                      // Perform the match, based on the selected method.
                      switch(method) {
                      case 1: // !EQ
                           pass = !(source.equals(target));
                           break;
                      case 2: // <
                           pass = (source.compareTo(target) < 0);
                           break;
                      case 3: // <eq
                           pass = (source.compareTo(target) <= 0);
                      break;
                      case 4: // >
                           pass = (source.compareTo(target) > 0);
                           break;
                      case 5: // >eq
                           pass = (source.compareTo(target) >= 0);
                           break;
                      case 6: // ^
                           pass = source.startsWith(target);
                           break;
                      case 7: // !^
                           pass = !(source.startsWith(target));
                           break;
                      case 8: // $
                           pass = source.endsWith(target);
                           break;
                      case 9: // !$
                           pass = !(source.endsWith(target));
                           break;
                      case 10: // ?
                           pass = (source.indexOf(target) != -1);
                           break;
                      case 11: // !?
                           pass = (source.indexOf(target) == -1);
                           break;
                      default: // EQEQ
                           pass = source.equals(target);
                           break;
+                     }
                      result = result || pass;
+                }
+          }
           return result;
+     }
      /** Produce a textual representation of this autofilter.
       * @return A <strong>String</strong> displaying details of this autofilter.
       */
      public String toString() {
           String result = "One: " + method_one + " - " + value_one + " - " + casesense_one;
           if(value_two != null) {
                 result = result + "\n" + "Operation: " + (operation?"AND":"OR") + "\n";
                 result = result + "Two: " + method_two + " - " + value_two + " - " + casesense_two;
+          }
           return result;
+     }
+        for(int i = 0; i < values.size(); i++) {
+        boolean pass;
+        String source;
+        // Account for case sensitivity.
+        if(casesense) {
+            source = values.get(i).toString();
+        }
+        else {
+            source = values.get(i).toString().toLowerCase();
+        }
+        // Perform the match, based on the selected method.
+        switch(method) {
+        case 1: // !EQ
+            pass = !(source.equals(target));
+            break;
+        case 2: // <
+            pass = (source.compareTo(target) < 0);
+            break;
+        case 3: // <eq
+            pass = (source.compareTo(target) <= 0);
+            break;
+        case 4: // >
+            pass = (source.compareTo(target) > 0);
+            break;
+        case 5: // >eq
+            pass = (source.compareTo(target) >= 0);
+            break;
+        case 6: // ^
+            pass = source.startsWith(target);
+            break;
+        case 7: // !^
+            pass = !(source.startsWith(target));
+            break;
+        case 8: // $
+            pass = source.endsWith(target);
+            break;
+        case 9: // !$
+            pass = !(source.endsWith(target));
+            break;
+        case 10: // ?
+            pass = (source.indexOf(target) != -1);
+            break;
+        case 11: // !?
+            pass = (source.indexOf(target) == -1);
+            break;
+        default: // EQEQ
+            pass = source.equals(target);
+            break;
+        }
+        result = result || pass;
+        }
+    }
+    return result;
+    }
+    /** Produce a textual representation of this autofilter.
+     * @return A <strong>String</strong> displaying details of this autofilter.
+     */
+    public String toString() {
+    String result = "One: " + method_one + " - " + value_one + " - " + casesense_one;
+    if(value_two != null) {
+        result = result + "\n" + "Operation: " + (operation?"AND":"OR") + "\n";
+        result = result + "Two: " + method_two + " - " + value_two + " - " + casesense_two;
+    }
+    return result;
+    }
+}

trunk/gli/src/org/greenstone/gatherer/gui/metaaudit/AutofilterDialog.java

-              r4293
+              r4366
  */
 public final class AutofilterDialog
      extends JDialog {
      /** The filter being edited. */
      private Autofilter filter;
      /** A reference to ourselves so our inner classes can reference us. */
      private AutofilterDialog self;
      /** The value returned from the filter dialog prompt. Used to determine if a prompt was set or unset, and what subsequent action to take. */
      private byte return_value = 0;
      /** The button used to cancel the prompt. */
      private JButton cancel_button = null;
      /** The button used to accept and commit any changes to the autofilter. */
      private JButton ok_button = null;
      /** A check box used to specify that the given filters should be applied conjunctly. */
      private JCheckBox and_check = null;
      /** The check box used to specify whether the first filter is case sensitive. */
      private JCheckBox first_case = null;
      /** The none check is used to disable the second filter. */
      private JCheckBox none_check = null;
      /** The check box used to specify that the given filters should be applied disjunctly. */
      private JCheckBox or_check = null;
      /** The check box used to specify whether the second filter is case sensitive. */
      private JCheckBox second_case = null;
      /** Used to specify the order of the resulting set: Ascending or Descending. */
      private JComboBox order = null;
      /** The method used to match the first filter: Contains, Doesn't contain etc. */
      private JComboBox first_method = null;
      /** The value to be matched for the first filter. */
      private JComboBox first_value = null;
      /** The method used to match the first filter. Options as for the first method. */
      private JComboBox second_method = null;
      /** The value to be matched for the second filter. */
      private JComboBox second_value = null;
      /** Used for the most basic filter where an Equals, Case sensitive method is automatically used. */
      private JComboBox value = null;
      /** The label which displays the name of the currently selected column (the column that will be associated with the autofilter this dialog produces). */
      private JLabel name;
      /** The autofilter prompt contains two different panes, one for basic functionality and one for advanced. This containiner component is used to allow access to each via a 'tabbed' interface. */
      private JTabbedPane control = null;
      /** A reference back to the MetaAudit dialog that spawned this prompt. Used to make sure that any open dialog window is always in front of the audit pane. */
      private MetaAuditFrame dialog;
      /** The default size for the autofilter control. */
      static final private Dimension SIZE = new Dimension(640, 220);
      /** Constructor.
       * @param dialog A reference to the <strong>MetaAuditFrame</strong> that spawned this dialog.
       * @see org.greenstone.gatherer.gui.metaaudit.Autofilter
       * @see org.greenstone.gatherer.gui.metaaudit.AutofilterDialog.ButtonListener
       * @see org.greenstone.gatherer.gui.metaaudit.AutofilterDialog.CheckListener
       */
      public AutofilterDialog(MetaAuditFrame dialog) {
           super(Gatherer.g_man);
           this.dialog = dialog;
           this.self = this;
           setModal(true);
           setSize(SIZE);
           setTitle(get("Title"));
           // Creation
           JPanel content_pane = (JPanel) getContentPane();
           JPanel name_pane = new JPanel();
           JLabel name_label = new JLabel(get("Name"));
           JTextField name_template = new JTextField();
           name = new JLabel();
           name.setBorder(name_template.getBorder());
           control = new JTabbedPane();
           JPanel value_pane = new JPanel();
           JPanel inner_value_pane = new JPanel();
           JLabel value_label = new JLabel(get("eqeq"));
           value = new JComboBox();
           value.setEditable(false);
           JPanel custom_pane = new JPanel();
           JPanel first_pane = new JPanel();
           first_method = new JComboBox();
           first_value = new JComboBox();
           first_value.setEditable(true);
           first_value.addItem("");
           first_value.setSelectedItem("");
           first_case = new JCheckBox(get("Case_Sensitive"));
           JPanel operator_pane = new JPanel();
           JLabel operator_label = new JLabel(get("Operator"));
           ButtonGroup operator_group = new ButtonGroup();
           and_check = new JCheckBox(get("AND"));
           none_check = new JCheckBox(get("None"));
           or_check = new JCheckBox(get("OR"));
           none_check.setSelected(true);
           operator_group.add(none_check);
           operator_group.add(and_check);
           operator_group.add(or_check);
           JPanel second_pane = new JPanel();
           second_method = new JComboBox();
           second_method.setEnabled(false);
           second_value = new JComboBox();
           second_value.setEditable(true);
           second_value.setEnabled(false);
           second_value.addItem("");
           second_value.setSelectedItem("");
           second_case = new JCheckBox(get("Case_Sensitive"));
           JPanel lower_pane = new JPanel();
           JPanel order_pane = new JPanel();
           JLabel order_label = new JLabel(get("Order"));
           order = new JComboBox();
           order.addItem(get("Ascending"));
           order.addItem(get("Descending"));
           // Assign values to method comboboxes.
           for(int i = 0; i < Autofilter.METHOD_LIST.length; i++) {
                 first_method.addItem(get(Autofilter.METHOD_LIST[i]));
                 second_method.addItem(get(Autofilter.METHOD_LIST[i]));
+          }
           JPanel button_pane = new JPanel();
           cancel_button = new JButton(get("Clear"));
           cancel_button.setMnemonic(KeyEvent.VK_C);
           ok_button = new JButton(get("Set"));
           ok_button.setMnemonic(KeyEvent.VK_S);
           // Connection
           and_check.addActionListener(new CheckListener(true));
           cancel_button.addActionListener(new ButtonListener(false));
           none_check.addActionListener(new CheckListener(false));
           ok_button.addActionListener(new ButtonListener(true));
           or_check.addActionListener(new CheckListener(true));
           // Layout
           name_label.setBorder(BorderFactory.createEmptyBorder(0,0,0,5));
           name_pane.setBorder(BorderFactory.createEmptyBorder(0,0,5,0));
           name_pane.setLayout(new BorderLayout());
           name_pane.add(name_label, BorderLayout.WEST);
           name_pane.add(name, BorderLayout.CENTER);
           value_label.setBorder(BorderFactory.createEmptyBorder(0,0,0,5));
           inner_value_pane.setLayout(new BorderLayout());
           inner_value_pane.add(value_label, BorderLayout.WEST);
           inner_value_pane.add(value, BorderLayout.CENTER);
           value_pane.setBorder(BorderFactory.createEmptyBorder(5,10,5,10));
           value_pane.setLayout(new BorderLayout());
           value_pane.add(inner_value_pane, BorderLayout.NORTH);
           first_pane.setLayout(new BorderLayout());
           first_pane.add(first_method, BorderLayout.WEST);
           first_pane.add(first_value, BorderLayout.CENTER);
           first_pane.add(first_case, BorderLayout.EAST);
           operator_pane.setLayout(new GridLayout(1,4));
           operator_pane.add(operator_label);
           operator_pane.add(none_check);
           operator_pane.add(and_check);
           operator_pane.add(or_check);
           second_pane.setLayout(new BorderLayout());
           second_pane.add(second_method, BorderLayout.WEST);
           second_pane.add(second_value, BorderLayout.CENTER);
           second_pane.add(second_case, BorderLayout.EAST);
           order_pane.setLayout(new GridLayout(1,2));
           order_pane.add(order_label);
           order_pane.add(order);
           custom_pane.setBorder(BorderFactory.createEmptyBorder(2,2,2,2));
           custom_pane.setLayout(new GridLayout(3,1));
           custom_pane.add(first_pane);
           custom_pane.add(operator_pane);
           custom_pane.add(second_pane);
+    extends JDialog {
+    /** The filter being edited. */
+    private Autofilter filter;
+    /** A reference to ourselves so our inner classes can reference us. */
+    private AutofilterDialog self;
+    /** The value returned from the filter dialog prompt. Used to determine if a prompt was set or unset, and what subsequent action to take. */
+    private byte return_value = 0;
+    /** The button used to cancel the prompt. */
+    private JButton cancel_button = null;
+    /** The button used to accept and commit any changes to the autofilter. */
+    private JButton ok_button = null;
+    /** A check box used to specify that the given filters should be applied conjunctly. */
+    private JCheckBox and_check = null;
+    /** The check box used to specify whether the first filter is case sensitive. */
+    private JCheckBox first_case = null;
+    /** The none check is used to disable the second filter. */
+    private JCheckBox none_check = null;
+    /** The check box used to specify that the given filters should be applied disjunctly. */
+    private JCheckBox or_check = null;
+    /** The check box used to specify whether the second filter is case sensitive. */
+    private JCheckBox second_case = null;
+    /** Used to specify the order of the resulting set: Ascending or Descending. */
+    private JComboBox order = null;
+    /** The method used to match the first filter: Contains, Doesn't contain etc. */
+    private JComboBox first_method = null;
+    /** The value to be matched for the first filter. */
+    private JComboBox first_value = null;
+    /** The method used to match the first filter. Options as for the first method. */
+    private JComboBox second_method = null;
+    /** The value to be matched for the second filter. */
+    private JComboBox second_value = null;
+    /** Used for the most basic filter where an Equals, Case sensitive method is automatically used. */
+    private JComboBox value = null;
+    /** The label which displays the name of the currently selected column (the column that will be associated with the autofilter this dialog produces). */
+    private JLabel name;
+    /** The autofilter prompt contains two different panes, one for basic functionality and one for advanced. This containiner component is used to allow access to each via a 'tabbed' interface. */
+    private JTabbedPane control = null;
+    /** A reference back to the MetaAudit dialog that spawned this prompt. Used to make sure that any open dialog window is always in front of the audit pane. */
+    private MetaAuditFrame dialog;
+    /** The default size for the autofilter control. */
+    static final private Dimension SIZE = new Dimension(640, 220);
+    /** Constructor.
+     * @param dialog A reference to the <strong>MetaAuditFrame</strong> that spawned this dialog.
+     * @see org.greenstone.gatherer.gui.metaaudit.Autofilter
+     * @see org.greenstone.gatherer.gui.metaaudit.AutofilterDialog.ButtonListener
+     * @see org.greenstone.gatherer.gui.metaaudit.AutofilterDialog.CheckListener
+     */
+    public AutofilterDialog(MetaAuditFrame dialog) {
+    super(Gatherer.g_man);
+    this.dialog = dialog;
+    this.self = this;
+    setModal(true);
+    setSize(SIZE);
+    setTitle(get("Title"));
+    // Creation
+    JPanel content_pane = (JPanel) getContentPane();
+    JPanel name_pane = new JPanel();
+    JLabel name_label = new JLabel(get("Name"));
+    JTextField name_template = new JTextField();
+    name = new JLabel();
+    name.setBorder(name_template.getBorder());
+    control = new JTabbedPane();
+    JPanel value_pane = new JPanel();
+    JPanel inner_value_pane = new JPanel();
+    JLabel value_label = new JLabel(get("eqeq"));
+    value = new JComboBox();
+    value.setEditable(false);
+    JPanel custom_pane = new JPanel();
+    JPanel first_pane = new JPanel();
+    first_method = new JComboBox();
+    first_value = new JComboBox();
+    first_value.setEditable(true);
+    first_value.addItem("");
+    first_value.setSelectedItem("");
+    first_case = new JCheckBox(get("Case_Sensitive"));
+    JPanel operator_pane = new JPanel();
+    JLabel operator_label = new JLabel(get("Operator"));
+    ButtonGroup operator_group = new ButtonGroup();
+    and_check = new JCheckBox(get("AND"));
+    none_check = new JCheckBox(get("None"));
+    or_check = new JCheckBox(get("OR"));
+    none_check.setSelected(true);
+    operator_group.add(none_check);
+    operator_group.add(and_check);
+    operator_group.add(or_check);
+    JPanel second_pane = new JPanel();
+    second_method = new JComboBox();
+    second_method.setEnabled(false);
+    second_value = new JComboBox();
+    second_value.setEditable(true);
+    second_value.setEnabled(false);
+    second_value.addItem("");
+    second_value.setSelectedItem("");
+    second_case = new JCheckBox(get("Case_Sensitive"));
+    JPanel lower_pane = new JPanel();
+    JPanel order_pane = new JPanel();
+    JLabel order_label = new JLabel(get("Order"));
+    order = new JComboBox();
+    order.addItem(get("Ascending"));
+    order.addItem(get("Descending"));
+    // Assign values to method comboboxes.
+    for(int i = 0; i < Autofilter.METHOD_LIST.length; i++) {
+        first_method.addItem(get(Autofilter.METHOD_LIST[i]));
+        second_method.addItem(get(Autofilter.METHOD_LIST[i]));
+    }
+    JPanel button_pane = new JPanel();
+    cancel_button = new JButton(get("Clear"));
+    cancel_button.setMnemonic(KeyEvent.VK_C);
+    ok_button = new JButton(get("Set"));
+    ok_button.setMnemonic(KeyEvent.VK_S);
+    // Connection
+    and_check.addActionListener(new CheckListener(true));
+    cancel_button.addActionListener(new ButtonListener(false));
+    none_check.addActionListener(new CheckListener(false));
+    ok_button.addActionListener(new ButtonListener(true));
+    or_check.addActionListener(new CheckListener(true));
+    // Layout
+    name_label.setBorder(BorderFactory.createEmptyBorder(0,0,0,5));
+    name_pane.setBorder(BorderFactory.createEmptyBorder(0,0,5,0));
+    name_pane.setLayout(new BorderLayout());
+    name_pane.add(name_label, BorderLayout.WEST);
+    name_pane.add(name, BorderLayout.CENTER);
+    value_label.setBorder(BorderFactory.createEmptyBorder(0,0,0,5));
+    inner_value_pane.setLayout(new BorderLayout());
+    inner_value_pane.add(value_label, BorderLayout.WEST);
+    inner_value_pane.add(value, BorderLayout.CENTER);
+    value_pane.setBorder(BorderFactory.createEmptyBorder(5,10,5,10));
+    value_pane.setLayout(new BorderLayout());
+    value_pane.add(inner_value_pane, BorderLayout.NORTH);
+    first_pane.setLayout(new BorderLayout());
+    first_pane.add(first_method, BorderLayout.WEST);
+    first_pane.add(first_value, BorderLayout.CENTER);
+    first_pane.add(first_case, BorderLayout.EAST);
+    operator_pane.setLayout(new GridLayout(1,4));
+    operator_pane.add(operator_label);
+    operator_pane.add(none_check);
+    operator_pane.add(and_check);
+    operator_pane.add(or_check);
+    second_pane.setLayout(new BorderLayout());
+    second_pane.add(second_method, BorderLayout.WEST);
+    second_pane.add(second_value, BorderLayout.CENTER);
+    second_pane.add(second_case, BorderLayout.EAST);
+    order_pane.setLayout(new GridLayout(1,2));
+    order_pane.add(order_label);
+    order_pane.add(order);
+    custom_pane.setBorder(BorderFactory.createEmptyBorder(2,2,2,2));
+    custom_pane.setLayout(new GridLayout(3,1));
+    custom_pane.add(first_pane);
+    custom_pane.add(operator_pane);
+    custom_pane.add(second_pane);
           control.add(get("Filter_By_Value"), value_pane);
           control.add(get("Custom_Filter"), custom_pane);
           button_pane.setBorder(BorderFactory.createEmptyBorder(5,0,0,0));
           button_pane.setLayout(new GridLayout(1,2));
           button_pane.add(ok_button);
           button_pane.add(cancel_button);
           lower_pane.setLayout(new BorderLayout());
           lower_pane.add(order_pane, BorderLayout.CENTER);
           lower_pane.add(button_pane, BorderLayout.SOUTH);
           content_pane.setBorder(BorderFactory.createEmptyBorder(5,5,5,5));
           content_pane.setLayout(new BorderLayout());
           content_pane.add(name_pane, BorderLayout.NORTH);
           content_pane.add(control, BorderLayout.CENTER);
           content_pane.add(lower_pane, BorderLayout.SOUTH);
           Dimension screen_size = Gatherer.config.screen_size;
           setLocation((screen_size.width - SIZE.width) / 2, (screen_size.height - SIZE.height) / 2);
           screen_size = null;
+     }
      /** Destructor. */
      public void destroy() {
           dispose();
           cancel_button = null;
           ok_button = null;
           and_check = null;
           first_case = null;
           none_check = null;
           or_check = null;
           second_case = null;
           order = null;
           first_method = null;
           first_value = null;
           second_method = null;
           second_value = null;
           value = null;
           control = null;
           dialog = null;
           self = null;
           name = null;
+     }
      /** Display the modal dialog box, allowing the user to define the filter. When the user presses one of the buttons, dispose and return to the caller providing an indication of which button was pressed.
+    control.add(get("Filter_By_Value"), value_pane);
+    control.add(get("Custom_Filter"), custom_pane);
+    button_pane.setBorder(BorderFactory.createEmptyBorder(5,0,0,0));
+    button_pane.setLayout(new GridLayout(1,2));
+    button_pane.add(ok_button);
+    button_pane.add(cancel_button);
+    lower_pane.setLayout(new BorderLayout());
+    lower_pane.add(order_pane, BorderLayout.CENTER);
+    lower_pane.add(button_pane, BorderLayout.SOUTH);
+    content_pane.setBorder(BorderFactory.createEmptyBorder(5,5,5,5));
+    content_pane.setLayout(new BorderLayout());
+    content_pane.add(name_pane, BorderLayout.NORTH);
+    content_pane.add(control, BorderLayout.CENTER);
+    content_pane.add(lower_pane, BorderLayout.SOUTH);
+    Dimension screen_size = Gatherer.config.screen_size;
+    setLocation((screen_size.width - SIZE.width) / 2, (screen_size.height - SIZE.height) / 2);
+    screen_size = null;
+    }
+    /** Destructor. */
+    public void destroy() {
+    dispose();
+    cancel_button = null;
+    ok_button = null;
+    and_check = null;
+    first_case = null;
+    none_check = null;
+    or_check = null;
+    second_case = null;
+    order = null;
+    first_method = null;
+    first_value = null;
+    second_method = null;
+    second_value = null;
+    value = null;
+    control = null;
+    dialog = null;
+    self = null;
+    name = null;
+    }
+    /** Display the modal dialog box, allowing the user to define the filter. When the user presses one of the buttons, dispose and return to the caller providing an indication of which button was pressed.
       * @return An <i>int</i> which indicates which button was pressed to dismiss the dialog.
       */
      public Autofilter display(Autofilter filter, ArrayList raw_values, String column_name) {
           this.filter = filter;
           name.setText(column_name);
           // Prune values so it only contains unique entries, then order.
           TreeSet values = new TreeSet(raw_values);
           value.setModel(new DefaultComboBoxModel(values.toArray()));
           String star = "*";
           value.insertItemAt(star, 0);
           value.setSelectedItem(star);
           first_value.setModel(new DefaultComboBoxModel(values.toArray()));
           second_value.setModel(new DefaultComboBoxModel(values.toArray()));
           // Restore previous values.
           if(filter != null && filter.value_one != null) {
                 value.setSelectedItem(filter.value_one);
                 first_method.setSelectedIndex(filter.method_one);
                 first_value.setSelectedItem(filter.value_one);
                 first_case.setSelected(filter.casesense_one);
                 if(filter.value_two == null) {
                      none_check.setSelected(true);
+                }
                 else {
                      if(filter.operation) {
                           and_check.setSelected(true);
+                     }
                      else {
                           or_check.setSelected(true);
+                     }
                      second_method.setSelectedIndex(filter.method_two);
                      second_value.setSelectedItem(filter.value_two);
                      second_case.setSelected(filter.casesense_two);
+                }
                 if(filter.sort) {
                      order.setSelectedIndex(0);
+                }
                 else {
                      order.setSelectedIndex(1);
+                }
+          }
           // Display
           show();
           dialog.toFront();
           return this.filter;
+     }
      /** Use the given key to retrieve a phrase from the dictionary.
+    public Autofilter display(Autofilter filter, ArrayList raw_values, String column_name) {
+    this.filter = filter;
+    name.setText(column_name);
+    // Prune values so it only contains unique entries, then order.
+    TreeSet values = new TreeSet(raw_values);
+    value.setModel(new DefaultComboBoxModel(values.toArray()));
+    String star = "*";
+    value.insertItemAt(star, 0);
+    value.setSelectedItem(star);
+    first_value.setModel(new DefaultComboBoxModel(values.toArray()));
+    second_value.setModel(new DefaultComboBoxModel(values.toArray()));
+    // Restore previous values.
+    if(filter != null && filter.value_one != null) {
+        value.setSelectedItem(filter.value_one);
+        first_method.setSelectedIndex(filter.method_one);
+        first_value.setSelectedItem(filter.value_one);
+        first_case.setSelected(filter.casesense_one);
+        if(filter.value_two == null) {
+        none_check.setSelected(true);
+        }
+        else {
+        if(filter.operation) {
+            and_check.setSelected(true);
+        }
+        else {
+            or_check.setSelected(true);
+        }
+        second_method.setSelectedIndex(filter.method_two);
+        second_value.setSelectedItem(filter.value_two);
+        second_case.setSelected(filter.casesense_two);
+        }
+        if(filter.sort) {
+        order.setSelectedIndex(0);
+        }
+        else {
+        order.setSelectedIndex(1);
+        }
+    }
+    // Display
+    show();
+    dialog.toFront();
+    return this.filter;
+    }
+    /** Use the given key to retrieve a phrase from the dictionary.
       * @param key A <strong>String</strong> which uniquely maps to an entry in the Dictionary.
       * @return The <strong>String</strong> to key mapped to.
       * @see org.greenstone.gatherer.Dictionary
       */
+     private final String get(String key) {
+          if(key.indexOf(".") == -1) {
+                key = "Autofilter." + key;
+          }
+          return Gatherer.dictionary.get(key, (String[])null);
+     }
+     /** Listens for actions on the button it is attached to, and when notified sets the return_value and disposes of the dialog. */
+     private final class ButtonListener
+          implements ActionListener {
+          private boolean return_filter;
+          /** Does an action on this button cause a filter to be returned. */
+          /** Constructor takes an associated return value as an argument.
+            * @param return_filter <i>true</i> if we update then return the filter, <i>false</i> to clear existing filter.
+    private final String get(String key) {
+    if(key.indexOf(".") == -1) {
+        key = "Autofilter." + key;
+    }
+    return Gatherer.dictionary.get(key, (String[])null);
+    }
+    /** Listens for actions on the button it is attached to, and when notified sets the return_value and disposes of the dialog. */
+    private final class ButtonListener
+    implements ActionListener {
+    private boolean return_filter;
+    /** Does an action on this button cause a filter to be returned. */
+    /** Constructor takes an associated return value as an argument.
+     * @param return_filter <i>true</i> if we update then return the filter, <i>false</i> to clear existing filter.
+     */
+    public ButtonListener(boolean return_filter) {
+        this.return_filter = return_filter;
+    }
+    /** When any registered component is actioned apon, set the value and hide the dialog. We hide rather than dispose, because hide assures the data values will be retained.
+     * @param event An <strong>ActionEvent</strong> containing information about the action that caused this method call.
+     * @see org.greenstone.gatherer.gui.metaaudit.Autofilter
+     */
+    public void actionPerformed(ActionEvent event) {
+        if(return_filter) {
+        if(control.getSelectedIndex() == 0) {
+            filter.setFilter(1, 0, (String)value.getSelectedItem(), true);
+            filter.setFilter(2, 0, null, true);
+        }
+        else {
+            filter.setFilter(1, first_method.getSelectedIndex(), (String)first_value.getSelectedItem(), first_case.isSelected());
+            if(!none_check.isSelected()) {
+            if(and_check.isSelected()) {
+                filter.setOperation(Autofilter.AND);
+            }
+            else {
+                filter.setOperation(Autofilter.OR);
+            }
+            filter.setFilter(2, second_method.getSelectedIndex(), (String)second_value.getSelectedItem(), second_case.isSelected());
+            }
+        }
+        if(order.getSelectedIndex() == 0) {
+            filter.setSort(Autofilter.ASCENDING);
+        }
+        else {
+            filter.setSort(Autofilter.DESCENDING);
+        }
+        }
+        else {
+        filter = null;
+        }
+        hide();
+    }
+    }
+    /** Listens for actions on the check box it is attached to, and when notified sets the state of the second method and value to the specified state. */
+    private final class CheckListener
+    implements ActionListener {
+    /** The default desire state any check button this listens to. */
+    private boolean desired_state = false;
+    /** The constructor takes an associated desired state.
+     * @param desired_state The state that should be set when this is actioned, as a <i>boolean</i>.
             */
+          public ButtonListener(boolean return_filter) {
+                this.return_filter = return_filter;
+          }
+          /** When any registered component is actioned apon, set the value and hide the dialog. We hide rather than dispose, because hide assures the data values will be retained.
+            * @param event An <strong>ActionEvent</strong> containing information about the action that caused this method call.
+            * @see org.greenstone.gatherer.gui.metaaudit.Autofilter
+            */
+          public void actionPerformed(ActionEvent event) {
+                if(return_filter) {
+                     if(control.getSelectedIndex() == 0) {
+                          filter.setFilter(1, 0, (String)value.getSelectedItem(), true);
+                          filter.setFilter(2, 0, null, true);
+                     }
+                     else {
+                          filter.setFilter(1, first_method.getSelectedIndex(), (String)first_value.getSelectedItem(), first_case.isSelected());
+                          if(!none_check.isSelected()) {
+                                if(and_check.isSelected()) {
+                                     filter.setOperation(Autofilter.AND);
+                                }
+                                else {
+                                     filter.setOperation(Autofilter.OR);
+                                }
+                                filter.setFilter(2, second_method.getSelectedIndex(), (String)second_value.getSelectedItem(), second_case.isSelected());
+                          }
+                     }
+                     if(order.getSelectedIndex() == 0) {
+                          filter.setSort(Autofilter.ASCENDING);
+                     }
+                     else {
+                          filter.setSort(Autofilter.DESCENDING);
+                     }
+                }
+                else {
+                     filter = null;
+                }
+                hide();
+          }
+     }
+     /** Listens for actions on the check box it is attached to, and when notified sets the state of the second method and value to the specified state. */
+     private final class CheckListener
+          implements ActionListener {
+          /** The default desire state any check button this listens to. */
+          private boolean desired_state = false;
+          /** The constructor takes an associated desired state.
+            * @param desired_state The state that should be set when this is actioned, as a <i>boolean</i>.
+            */
+          public CheckListener(boolean desired_state) {
+                this.desired_state = desired_state;
+          }
+          /** Whenever our registered components are actioned apon, set the state of the second method and value to the desired state. */
+          public void actionPerformed(ActionEvent event) {
+                second_method.setEnabled(desired_state);
+                second_value.setEnabled(desired_state);
+          }
+     }
+    public CheckListener(boolean desired_state) {
+        this.desired_state = desired_state;
+    }
+    /** Whenever our registered components are actioned apon, set the state of the second method and value to the desired state. */
+    public void actionPerformed(ActionEvent event) {
+        second_method.setEnabled(desired_state);
+        second_value.setEnabled(desired_state);
+    }
+    }
+}

trunk/gli/src/org/greenstone/gatherer/gui/metaaudit/Filter.java

-              r4293
+              r4366
  */
 public class Filter
      implements TableModelFilter {
      /** An array of autofilters. */
      private Autofilter filters[];
      /** The registered TableModelFilterListeners. */
      private Vector listeners = new Vector ();
      /** Constructor.
       * @param columns The number of columns this Filter will be expected to filter, as an <i>int</i>.
+    implements TableModelFilter {
+    /** An array of autofilters. */
+    private Autofilter filters[];
+    /** The registered TableModelFilterListeners. */
+    private Vector listeners = new Vector ();
+    /** Constructor.
+     * @param columns The number of columns this Filter will be expected to filter, as an <i>int</i>.
       */
      public Filter(int columns) {
           filters = new Autofilter[columns];
+     }
      /** Add a TableModelFilterListener to the TableModelFilter.
+    public Filter(int columns) {
+    filters = new Autofilter[columns];
+    }
+    /** Add a TableModelFilterListener to the TableModelFilter.
       * @param listener The <strong>TableModelFilterListener</strong> to add, if it isn't already registered.
       */
      public synchronized void addTableModelFilterListener(TableModelFilterListener listener) {
           if (!listeners.contains(listener)) {
                 listeners.addElement(listener);
+          }
+     }
      /** Remove a filter from a column.
+    public synchronized void addTableModelFilterListener(TableModelFilterListener listener) {
+    if (!listeners.contains(listener)) {
+        listeners.addElement(listener);
+    }
+    }
+    /** Remove a filter from a column.
       * @param column The column number to remove the filter from, as an <i>int</i>.
       */
      public void clearFilter(int column) {
           if(filters[column] != null) {
                 filters[column].setActive(false);
+          }
+     }
      /** Determine if a certain row should be shown in the table by checking it against all the current filters.
+    public void clearFilter(int column) {
+    if(filters[column] != null) {
+        filters[column].setActive(false);
+    }
+    }
+    /** Determine if a certain row should be shown in the table by checking it against all the current filters.
       * @param model The <strong>TableModel</strong> the row is from.
       * @param row The row number as an <i>int</i>
       * @return <i>true</i> if the rows data matches all autofilters set and should be displayed, <i>false</i> otherwise.
       */
      public boolean filter(TableModel model, int row) {
           boolean result = true;
           for(int i = 0; result && i < filters.length; i++) {
                 if(filters[i] != null && filters[i].active()) {
                      ArrayList values = (ArrayList) model.getValueAt(row, i);
                      result = result && filters[i].filter(values);
+                }
+          }
           return result;
+     }
      /** Retrieve the autofilter associated with a certain column.
+    public boolean filter(TableModel model, int row) {
+    boolean result = true;
+    for(int i = 0; result && i < filters.length; i++) {
+        if(filters[i] != null && filters[i].active()) {
+        ArrayList values = (ArrayList) model.getValueAt(row, i);
+        result = result && filters[i].filter(values);
+        }
+    }
+    return result;
+    }
+    /** Retrieve the autofilter associated with a certain column.
       * @param column The column number as an <i>int</i>.
       * @return The <strong>Autofilter</strong> assigned to that column.
       */
      public Autofilter getFilter(int column) {
           Autofilter filter = filters[column];
           if(filter == null) {
                 filter = new Autofilter();
                 filters[column] = filter;
+          }
           return filter;
+     }
      /** Determine if a certain column is filtered.
+    public Autofilter getFilter(int column) {
+    Autofilter filter = filters[column];
+    if(filter == null) {
+        filter = new Autofilter();
+        filters[column] = filter;
+    }
+    return filter;
+    }
+    /** Determine if a certain column is filtered.
       * @param column The column number as an <i>int</i>.
       * @return <i>true</i> if there is an active autofilter assigned to this column, <i>false</i> otherwise.
       */
      public boolean isFiltered(int column) {
           boolean result = false;
           if(filters[column] != null) {
                 result = filters[column].active();
+          }
           return result;
+     }
      /** Remove a TableModelFilterListener from the TableModelFilter.
+    public boolean isFiltered(int column) {
+    boolean result = false;
+    if(filters[column] != null) {
+        result = filters[column].active();
+    }
+    return result;
+    }
+    /** Remove a TableModelFilterListener from the TableModelFilter.
       * @param listener The <strong>TableModelFilterListener</strong> to remove.
       */
      public synchronized  void removeTableModelFilterListener(TableModelFilterListener listener) {
           listeners.removeElement(listener);
+     }
      /** Called whenever the filters assigned changes significantly, thus prompting a reload of the table model data. */
      public void fireFilterChanged() {
           ///ystem.err.println("Filter Changed!");
           Vector tmp;
           synchronized(this) {
                 tmp = (Vector) listeners.clone();
+          }
+    public synchronized  void removeTableModelFilterListener(TableModelFilterListener listener) {
+    listeners.removeElement(listener);
+    }
+    /** Called whenever the filters assigned changes significantly, thus prompting a reload of the table model data. */
+    public void fireFilterChanged() {
+    ///ystem.err.println("Filter Changed!");
+    Vector tmp;
+    synchronized(this) {
+        tmp = (Vector) listeners.clone();
+    }
           TableModelFilterEvent event = new TableModelFilterEvent (this);
           for (Enumeration enum = tmp.elements();
                  enum.hasMoreElements(); ) {
                 ((TableModelFilterListener)enum.nextElement()).filterChanged(event);
+          }
+     }
+    TableModelFilterEvent event = new TableModelFilterEvent (this);
+    for (Enumeration enum = tmp.elements();
+         enum.hasMoreElements(); ) {
+        ((TableModelFilterListener)enum.nextElement()).filterChanged(event);
+    }
+    }
+}

trunk/gli/src/org/greenstone/gatherer/gui/metaaudit/HeaderListener.java

-              r4293
+              r4366
 public class HeaderListener
      extends MouseAdapter {
      private MetaAuditFrame parent_frame;
      private MetaAuditTable table;
      public HeaderListener(MetaAuditFrame parent_frame, MetaAuditTable table) {
           this.parent_frame = parent_frame;
           this.table = table;
+     }
+    extends MouseAdapter {
+    private MetaAuditFrame parent_frame;
+    private MetaAuditTable table;
+    public HeaderListener(MetaAuditFrame parent_frame, MetaAuditTable table) {
+    this.parent_frame = parent_frame;
+    this.table = table;
+    }
      public void mouseClicked(MouseEvent event) {
           // Determine the column this was clicked on.
           int column = table.getColumnModel().getColumnIndexAtX(event.getX());
           int clicked_column = table.convertColumnIndexToModel(column);
           // Display the currently assigned filter.
           Filter filter_model = table.getFilter();
           Autofilter filter = filter_model.getFilter(clicked_column);
           MetaAuditModel model = table.getOriginalModel();
           ArrayList default_values = model.getColumnValues(clicked_column);
           String column_name = model.getColumnName(clicked_column);
           filter = parent_frame.autofilter_dialog.display(filter, default_values, column_name);
           if(filter == null) {
                 filter_model.clearFilter(clicked_column);
+          }
           else {
                 filter.setActive(true);
                 TableModelSorter sorter = table.getSorter();
                 sorter.setSortColumn(clicked_column);
                 sorter.setSortAscending(filter.sort);
+          }
           filter_model.fireFilterChanged();
+     }
+    public void mouseClicked(MouseEvent event) {
+    // Determine the column this was clicked on.
+    int column = table.getColumnModel().getColumnIndexAtX(event.getX());
+    int clicked_column = table.convertColumnIndexToModel(column);
+    // Display the currently assigned filter.
+    Filter filter_model = table.getFilter();
+    Autofilter filter = filter_model.getFilter(clicked_column);
+    MetaAuditModel model = table.getOriginalModel();
+    ArrayList default_values = model.getColumnValues(clicked_column);
+    String column_name = model.getColumnName(clicked_column);
+    filter = parent_frame.autofilter_dialog.display(filter, default_values, column_name);
+    if(filter == null) {
+        filter_model.clearFilter(clicked_column);
+    }
+    else {
+        filter.setActive(true);
+        TableModelSorter sorter = table.getSorter();
+        sorter.setSortColumn(clicked_column);
+        sorter.setSortAscending(filter.sort);
+    }
+    filter_model.fireFilterChanged();
+    }
+}

trunk/gli/src/org/greenstone/gatherer/gui/metaaudit/HeaderRenderer.java

-              r4293
+              r4366
  */
 public class HeaderRenderer
      extends JToggleButton
      implements TableCellRenderer {
      /** The constructor sets up a margin around the button, and adds the filter icons.
       * @see org.greenstone.gatherer.util.Utility
       */
      public HeaderRenderer() {
           setMargin(new Insets(0,0,0,0));
           setIcon(Utility.getImage("filter.gif"));
           setSelectedIcon(Utility.getImage("filter-on.gif"));
+     }
      /** Called to create the component to be used as the 'rubber-stamp' for the table cell given the follwing arguments.
+    extends JToggleButton
+    implements TableCellRenderer {
+    /** The constructor sets up a margin around the button, and adds the filter icons.
+     * @see org.greenstone.gatherer.util.Utility
+     */
+    public HeaderRenderer() {
+    setMargin(new Insets(0,0,0,0));
+    setIcon(Utility.getImage("filter.gif"));
+    setSelectedIcon(Utility.getImage("filter-on.gif"));
+    }
+    /** Called to create the component to be used as the 'rubber-stamp' for the table cell given the follwing arguments.
       * @param table The <strong>JTable</strong> that is asking the renderer to draw; can be <i>null</i>.
       * @param value The value of the cell to be rendered as an <strong>Object</strong>. It is up to the specific renderer to interpret and draw the value. For example, if value is the string "true", it could be rendered as a string or it could be rendered as a check box that is checked. null is a valid value.
 …
       * @see org.greenstone.gatherer.gui.metaaudit.MetaAuditTable
       */
      public Component getTableCellRendererComponent(JTable table, Object value, boolean isSelected, boolean hasFocus, int row, int column) {
           setText(value.toString());
           MetaAuditTable temp = (MetaAuditTable) table;
           if(temp != null) { // And it may if this is called during table init.
                 setSelected(temp.isFiltered(column));
+          }
           return this;
+     }
+    public Component getTableCellRendererComponent(JTable table, Object value, boolean isSelected, boolean hasFocus, int row, int column) {
+    setText(value.toString());
+    MetaAuditTable temp = (MetaAuditTable) table;
+    if(temp != null) { // And it may if this is called during table init.
+        setSelected(temp.isFiltered(column));
+    }
+    return this;
+    }
+}

trunk/gli/src/org/greenstone/gatherer/gui/metaaudit/MetaAuditFrame.java

-              r4293
+              r4366
  */
 public class MetaAuditFrame
      extends JDialog
      implements TreeSelectionListener {
      public AutofilterDialog autofilter_dialog;
      /** Whether the selection has changed since the last time we built the model (because it has been hidden and theres no point refreshing a model you can't see!). */
      private boolean invalid = true;
      /** An array holding the most recent list of paths selected (plus some nulls for those paths removed). */
      private FileNode records[];
      /** A reference to ourselves so that inner classes can interact with us. */
      private MetaAuditFrame self;
      /** The table in which the metadata is shown. */
      private MetaAuditTable table;
      /** The default size for the metaaudit dialog. */
      static final private Dimension SIZE = new Dimension(640,480);
      /** The tolerance used to determine between a column resize, and a request for an AutoFilterDialog. */
      static final private int TOLERANCE = 3;
      /** Constructor.*/
      public MetaAuditFrame(TreeSynchronizer tree_sync, FileNode records[]) {
           super();
           // Arguments
           this.autofilter_dialog = new AutofilterDialog(this);
           this.records = records;
           this.self = this;
           this.table = new MetaAuditTable(this);
           // Creation
           setDefaultCloseOperation(JDialog.HIDE_ON_CLOSE);
           setSize(SIZE);
           setTitle(get("Title"));
           JPanel content_pane = (JPanel) getContentPane();
           JPanel button_pane = new JPanel();
           JButton close_button = new JButton(get("Close"));
           close_button.setMnemonic(KeyEvent.VK_C);
           // Connection
           close_button.addActionListener(new CloseListener());
           tree_sync.addTreeSelectionListener(this);
           // Layout
           button_pane.setBorder(BorderFactory.createEmptyBorder(5,5,5,5));
           button_pane.setLayout(new BorderLayout());
           button_pane.add(close_button, BorderLayout.CENTER);
+    extends JDialog
+    implements TreeSelectionListener {
+    public AutofilterDialog autofilter_dialog;
+    /** Whether the selection has changed since the last time we built the model (because it has been hidden and theres no point refreshing a model you can't see!). */
+    private boolean invalid = true;
+    /** An array holding the most recent list of paths selected (plus some nulls for those paths removed). */
+    private FileNode records[];
+    /** A reference to ourselves so that inner classes can interact with us. */
+    private MetaAuditFrame self;
+    /** The table in which the metadata is shown. */
+    private MetaAuditTable table;
+    /** The default size for the metaaudit dialog. */
+    static final private Dimension SIZE = new Dimension(640,480);
+    /** The tolerance used to determine between a column resize, and a request for an AutoFilterDialog. */
+    static final private int TOLERANCE = 3;
+    /** Constructor.*/
+    public MetaAuditFrame(TreeSynchronizer tree_sync, FileNode records[]) {
+    super();
+    // Arguments
+    this.autofilter_dialog = new AutofilterDialog(this);
+    this.records = records;
+    this.self = this;
+    this.table = new MetaAuditTable(this);
+    // Creation
+    setDefaultCloseOperation(JDialog.HIDE_ON_CLOSE);
+    setSize(SIZE);
+    setTitle(get("Title"));
+    JPanel content_pane = (JPanel) getContentPane();
+    JPanel button_pane = new JPanel();
+    JButton close_button = new JButton(get("Close"));
+    close_button.setMnemonic(KeyEvent.VK_C);
+    // Connection
+    close_button.addActionListener(new CloseListener());
+    tree_sync.addTreeSelectionListener(this);
+    // Layout
+    button_pane.setBorder(BorderFactory.createEmptyBorder(5,5,5,5));
+    button_pane.setLayout(new BorderLayout());
+    button_pane.add(close_button, BorderLayout.CENTER);
           content_pane.setBorder(BorderFactory.createEmptyBorder(5,5,5,5));
           content_pane.setLayout(new BorderLayout());
           content_pane.add(new JScrollPane(table), BorderLayout.CENTER);
           content_pane.add(button_pane, BorderLayout.SOUTH);
+    content_pane.setBorder(BorderFactory.createEmptyBorder(5,5,5,5));
+    content_pane.setLayout(new BorderLayout());
+    content_pane.add(new JScrollPane(table), BorderLayout.CENTER);
+    content_pane.add(button_pane, BorderLayout.SOUTH);
           Dimension screen_size = Gatherer.config.screen_size;
           setLocation((screen_size.width - SIZE.width) / 2, (screen_size.height - SIZE.height) / 2);
           screen_size = null;
           close_button = null;
           button_pane = null;
           content_pane = null;
+     }
      /** Destructor. */
      public void destroy() {
           records = null;
           self = null;
           table = null;
+     }
      /** Display the dialog on screen. */
      public void display() {
           if(invalid) {
                 rebuildModel();
+          }
           show();
+     }
      /** This method is called whenever the selection within the collection tree changes. This causes the table to be rebuilt with a new model.
       * @param event A <strong>TreeSelectionEvent</strong> containing information about the event.
       */
      public void valueChanged(TreeSelectionEvent event) {
           if(event.getSource() instanceof JTree) {
                 TreePath paths[] = Gatherer.g_man.metaedit_pane.collection_tree.getSelectionPaths();
                 if(paths != null) {
                      records = new FileNode[paths.length];
                      for(int i = 0; i < paths.length; i++) {
                           records[i] = (FileNode) paths[i].getLastPathComponent();
+                     }
                      if(isVisible()) {
                           rebuildModel();
+                     }
                      else {
                           invalid = true;
+                     }
+                }
+          }
+     }
      public void wait(boolean waiting) {
           Component glass_pane = getGlassPane();
           if(waiting) {
+    Dimension screen_size = Gatherer.config.screen_size;
+    setLocation((screen_size.width - SIZE.width) / 2, (screen_size.height - SIZE.height) / 2);
+    screen_size = null;
+    close_button = null;
+    button_pane = null;
+    content_pane = null;
+    }
+    /** Destructor. */
+    public void destroy() {
+    records = null;
+    self = null;
+    table = null;
+    }
+    /** Display the dialog on screen. */
+    public void display() {
+    if(invalid) {
+        rebuildModel();
+    }
+    show();
+    }
+    /** This method is called whenever the selection within the collection tree changes. This causes the table to be rebuilt with a new model.
+     * @param event A <strong>TreeSelectionEvent</strong> containing information about the event.
+     */
+    public void valueChanged(TreeSelectionEvent event) {
+    if(event.getSource() instanceof JTree) {
+        TreePath paths[] = Gatherer.g_man.metaedit_pane.collection_tree.getSelectionPaths();
+        if(paths != null) {
+        records = new FileNode[paths.length];
+        for(int i = 0; i < paths.length; i++) {
+            records[i] = (FileNode) paths[i].getLastPathComponent();
+        }
+        if(isVisible()) {
+            rebuildModel();
+        }
+        else {
+            invalid = true;
+        }
+        }
+    }
+    }
+    public void wait(boolean waiting) {
+    Component glass_pane = getGlassPane();
+    if(waiting) {
                 // Show wait cursor.
                 glass_pane.setCursor(Cursor.getPredefinedCursor(Cursor.WAIT_CURSOR));
                 glass_pane.setVisible(true);
+          }
           else {
+        glass_pane.setCursor(Cursor.getPredefinedCursor(Cursor.WAIT_CURSOR));
+        glass_pane.setVisible(true);
+    }
+    else {
                 // Hide wait cursor.
                 glass_pane.setVisible(false);
                 glass_pane.setCursor(Cursor.getPredefinedCursor(Cursor.DEFAULT_CURSOR));
+          }
           glass_pane = null;
+     }
      /** Retrieve a phrase from the Dictionary.
       * @param key A <strong>String</strong> which uniquely maps to a phrase.
       * @return The desired phrase as a </strong>String</strong>.
       * @see org.greenstone.gatherer.Dictionary
       */
      private String get(String key) {
           return Gatherer.dictionary.get("MetaAudit." + key);
+     }
      /** Rebuild the metaaudit table model using the current collection tree selection.
       */
      private void rebuildModel() {
           // Build and set model
           table.newModel(records);
           // Done.
           invalid = false;
+     }
      /** Listens for actions apon the close button, and if detected closes the dialog (storing its current size first). */
      private class CloseListener
           implements ActionListener {
           /** Any implementation of ActionListener must include this method so that we can be informed when an action has been performed on our target control(s).
             * @param event An <strong>ActionEvent</strong> containing information about the event.
             */
           public void actionPerformed(ActionEvent event) {
                 self.hide();
+          }
+     }
+        glass_pane.setVisible(false);
+        glass_pane.setCursor(Cursor.getPredefinedCursor(Cursor.DEFAULT_CURSOR));
+    }
+    glass_pane = null;
+    }
+    /** Retrieve a phrase from the Dictionary.
+     * @param key A <strong>String</strong> which uniquely maps to a phrase.
+     * @return The desired phrase as a </strong>String</strong>.
+     * @see org.greenstone.gatherer.Dictionary
+     */
+    private String get(String key) {
+    return Gatherer.dictionary.get("MetaAudit." + key);
+    }
+    /** Rebuild the metaaudit table model using the current collection tree selection.
+     */
+    private void rebuildModel() {
+    // Build and set model
+    table.newModel(records);
+    // Done.
+    invalid = false;
+    }
+    /** Listens for actions apon the close button, and if detected closes the dialog (storing its current size first). */
+    private class CloseListener
+    implements ActionListener {
+    /** Any implementation of ActionListener must include this method so that we can be informed when an action has been performed on our target control(s).
+     * @param event An <strong>ActionEvent</strong> containing information about the event.
+     */
+    public void actionPerformed(ActionEvent event) {
+        self.hide();
+    }
+    }
+}

trunk/gli/src/org/greenstone/gatherer/gui/metaaudit/MetaAuditModel.java

-              r4293
+              r4366
  */
 public class MetaAuditModel
      extends AbstractTableModel {
+    extends AbstractTableModel {
      private ArrayList elements;
      private MetadataTableCache data;
+    private ArrayList elements;
+    private MetadataTableCache data;
      public MetaAuditModel(FileNode records[]) {
           this.elements = new ArrayList(Gatherer.c_man.getCollection().msm.getElements());
           Collections.sort(this.elements);
           this.data = new MetadataTableCache(elements.size() + 1);
           // Work our way through the record array provided, adding files, skipping blanks and recursively searching directories.
           for(int i = 0; records != null && i < records.length; i++) {
                 if(records[i] != null) {
                      addRecord(records[i]);
+                }
+          }
+     }
      public Class getColumnClass(int column) {
           return ArrayList.class;
+     }
      public int getColumnCount() {
           return elements.size() + 1;
+     }
      public String getColumnName(int column) {
           String result;
           if(column == 0) {
                 result = Gatherer.dictionary.get("AuditTable.File");
+          }
           else {
                 result = elements.get(column - 1).toString();
+          }
           return result;
+     }
      public ArrayList getColumnValues(int column) {
           ArrayList column_values = new ArrayList();
           if(0 <= column && column < getColumnCount()) {
                 for(int i = 0; i < data.size(); i++) {
                      ArrayList values = (ArrayList) data.get(i, column);
                      for(int j = 0; j < values.size(); j++) {
                           column_values.add(values.get(j).toString());
+                     }
+                }
+          }
           return column_values;
+     }
      public int getRowCount() {
           return data.size();
+     }
      public Object getValueAt(int row, int column) {
           Object result = "";
           if(0 <= row && row < data.size() && 0 <= column && column < elements.size() + 1) {
                 result = data.get(row, column);
+          }
           return result;
+     }
+    public MetaAuditModel(FileNode records[]) {
+    this.elements = new ArrayList(Gatherer.c_man.getCollection().msm.getElements());
+    Collections.sort(this.elements);
+    this.data = new MetadataTableCache(elements.size() + 1);
+    // Work our way through the record array provided, adding files, skipping blanks and recursively searching directories.
+    for(int i = 0; records != null && i < records.length; i++) {
+        if(records[i] != null) {
+        addRecord(records[i]);
+        }
+    }
+    }
+    public Class getColumnClass(int column) {
+    return ArrayList.class;
+    }
+    public int getColumnCount() {
+    return elements.size() + 1;
+    }
+    public String getColumnName(int column) {
+    String result;
+    if(column == 0) {
+        result = Gatherer.dictionary.get("AuditTable.File");
+    }
+    else {
+        result = elements.get(column - 1).toString();
+    }
+    return result;
+    }
+    public ArrayList getColumnValues(int column) {
+    ArrayList column_values = new ArrayList();
+    if(0 <= column && column < getColumnCount()) {
+        for(int i = 0; i < data.size(); i++) {
+        ArrayList values = (ArrayList) data.get(i, column);
+        for(int j = 0; j < values.size(); j++) {
+            column_values.add(values.get(j).toString());
+        }
+        }
+    }
+    return column_values;
+    }
+    public int getRowCount() {
+    return data.size();
+    }
+    public Object getValueAt(int row, int column) {
+    Object result = "";
+    if(0 <= row && row < data.size() && 0 <= column && column < elements.size() + 1) {
+        result = data.get(row, column);
+    }
+    return result;
+    }
      public void reset() {
+     }
+    public void reset() {
+    }
      private void addRecord(FileNode record) {
           if(record.isLeaf()) {
                 File file = record.getFile();
                 data.newRow();
                 data.put(0, file.getName());
                 ArrayList metadatum = Gatherer.c_man.getCollection().gdm.getMetadata(file);
                 for(int i = 0; i < metadatum.size(); i++) {
                      Metadata metadata = (Metadata) metadatum.get(i);
                      data.put(elements.indexOf(metadata.getElement()) + 1, metadata.getValueNode());
+                }
+          }
           else {
                 for(int i = 0; i < record.getChildCount(); i++) {
                      addRecord((FileNode)record.getChildAt(i));
+                }
+          }
+     }
+    private void addRecord(FileNode record) {
+    if(record.isLeaf()) {
+        File file = record.getFile();
+        data.newRow();
+        data.put(0, file.getName());
+        ArrayList metadatum = Gatherer.c_man.getCollection().gdm.getMetadata(file);
+        for(int i = 0; i < metadatum.size(); i++) {
+        Metadata metadata = (Metadata) metadatum.get(i);
+        data.put(elements.indexOf(metadata.getElement()) + 1, metadata.getValueNode());
+        }
+    }
+    else {
+        for(int i = 0; i < record.getChildCount(); i++) {
+        addRecord((FileNode)record.getChildAt(i));
+        }
+    }
+    }
      private class MetadataTableCache {
           private ArrayList data;
           private ArrayList current_row[];
           private int columns;
           private RowComparator row_comparator = new RowComparator();
           public MetadataTableCache(int columns) {
                 this.columns = columns;
                 this.data = new ArrayList();
+          }
+    private class MetadataTableCache {
+    private ArrayList data;
+    private ArrayList current_row[];
+    private int columns;
+    private RowComparator row_comparator = new RowComparator();
+    public MetadataTableCache(int columns) {
+        this.columns = columns;
+        this.data = new ArrayList();
+    }
           public ArrayList get(int row, int column) {
                 ArrayList array_list[] = (ArrayList[]) data.get(row);
                 return array_list[column];
+          }
+    public ArrayList get(int row, int column) {
+        ArrayList array_list[] = (ArrayList[]) data.get(row);
+        return array_list[column];
+    }
           public void newRow() {
                 if(current_row != null) {
                      for(int i = 0; i < columns; i++) {
                           Collections.sort(current_row[i], row_comparator);
+                     }
+                }
                 current_row = new ArrayList[columns];
                 for(int i = 0; i < columns; i++) {
                      current_row[i] = new ArrayList();
+                }
                 data.add(current_row);
+          }
+    public void newRow() {
+        if(current_row != null) {
+        for(int i = 0; i < columns; i++) {
+            Collections.sort(current_row[i], row_comparator);
+        }
+        }
+        current_row = new ArrayList[columns];
+        for(int i = 0; i < columns; i++) {
+        current_row[i] = new ArrayList();
+        }
+        data.add(current_row);
+    }
           public void put(int column, Object value) {
                 current_row[column].add(value);
+          }
+    public void put(int column, Object value) {
+        current_row[column].add(value);
+    }
           public int size() {
                 return data.size();
+          }
+     }
+    public int size() {
+        return data.size();
+    }
+    }
      private class RowComparator
           implements Comparator {
           public int compare(Object o1, Object o2) {
                 return o1.toString().compareTo(o2.toString());
+          }
           public boolean equals(Object obj) {
                 return toString().equals(obj.toString());
+          }
+     }
+    private class RowComparator
+    implements Comparator {
+    public int compare(Object o1, Object o2) {
+        return o1.toString().compareTo(o2.toString());
+    }
+    public boolean equals(Object obj) {
+        return toString().equals(obj.toString());
+    }
+    }
+}

trunk/gli/src/org/greenstone/gatherer/gui/metaaudit/MetaAuditRenderer.java

-              r4293
+              r4366
 public class MetaAuditRenderer
      extends DefaultTableCellRenderer {
+    extends DefaultTableCellRenderer {
      public Component getTableCellRendererComponent(JTable table, Object value, boolean is_selected, boolean has_focus, int row, int column) {
           ArrayList array = (ArrayList) value;
           JLabel label = (JLabel) super.getTableCellRendererComponent(table, "", is_selected, has_focus, row, column);
           JPanel panel = new JPanel();
           panel.setBackground(label.getBackground());
           panel.setBorder(label.getBorder());
           if(array != null) {
                 panel.setLayout(new GridLayout(array.size(), 1));
                 for(int i = 0; i < array.size(); i++) {
                      JLabel entry = new JLabel(array.get(i).toString());
                      entry.setFont(label.getFont());
                      panel.add(entry);
+                }
+          }
           return panel;
+     }
+    public Component getTableCellRendererComponent(JTable table, Object value, boolean is_selected, boolean has_focus, int row, int column) {
+    ArrayList array = (ArrayList) value;
+    JLabel label = (JLabel) super.getTableCellRendererComponent(table, "", is_selected, has_focus, row, column);
+    JPanel panel = new JPanel();
+    panel.setBackground(label.getBackground());
+    panel.setBorder(label.getBorder());
+    if(array != null) {
+        panel.setLayout(new GridLayout(array.size(), 1));
+        for(int i = 0; i < array.size(); i++) {
+        JLabel entry = new JLabel(array.get(i).toString());
+        entry.setFont(label.getFont());
+        panel.add(entry);
+        }
+    }
+    return panel;
+    }
+}

trunk/gli/src/org/greenstone/gatherer/gui/metaaudit/MetaAuditTable.java

-              r4293
+              r4366
  */
 public class MetaAuditTable
      extends JTable
      implements TableModelSorterListener {
      private boolean initial_state;
      private boolean ready;
      private Filter filter;
      private HeaderRenderer header_renderer;
      private MetaAuditFrame parent_frame;
      private MetaAuditModel model;
      private SortedTableHelper helper;
      static final private int MARGIN = 10;
      public MetaAuditTable(MetaAuditFrame parent_frame) {
           super();
           this.header_renderer = new HeaderRenderer();
           this.parent_frame = parent_frame;
           getTableHeader().addMouseListener(new HeaderListener(parent_frame, this));
           setAutoResizeMode(AUTO_RESIZE_OFF);
           setDefaultRenderer(ArrayList.class, new MetaAuditRenderer());
           ready = true;
+     }
      public Filter getFilter() {
           return filter;
+     }
      public MetaAuditModel getOriginalModel() {
           return model;
+     }
      public TableModelSorter getSorter() {
           return helper.getTableModelSorter();
+     }
      public boolean isFiltered(int column) {
           if(filter == null) {
                 return false;
+          }
           return filter.isFiltered(column);
+     }
      public void newModel(FileNode records[]) {
           if(records == null || records.length == 0) {
                 return;
+          }
           wait(true);
           initial_state = true;
           ///ystem.err.println("Build new Model - should only be called once per click!");
           model = new MetaAuditModel(records);
           setModel(model);
           filter = new Filter(model.getColumnCount());
           helper = new SortedTableHelper (this, filter, new DefaultTableModelSorter(), header_renderer, null);
           helper.prepareTable();
           // Add renderer to columns.
           TableColumnModel column_model = getColumnModel();
           for(int i = 0; i < column_model.getColumnCount(); i++) {
                 column_model.getColumn(i).setHeaderRenderer(header_renderer);
+          }
           wait(false);
           initial_state = false;
+     }
      public void tableChanged(TableModelEvent e) {
           wait(true);
           super.tableChanged(e);
           if(ready) {
+    extends JTable
+    implements TableModelSorterListener {
+    private boolean initial_state;
+    private boolean ready;
+    private Filter filter;
+    private HeaderRenderer header_renderer;
+    private MetaAuditFrame parent_frame;
+    private MetaAuditModel model;
+    private SortedTableHelper helper;
+    static final private int MARGIN = 10;
+    public MetaAuditTable(MetaAuditFrame parent_frame) {
+    super();
+    this.header_renderer = new HeaderRenderer();
+    this.parent_frame = parent_frame;
+    getTableHeader().addMouseListener(new HeaderListener(parent_frame, this));
+    setAutoResizeMode(AUTO_RESIZE_OFF);
+    setDefaultRenderer(ArrayList.class, new MetaAuditRenderer());
+    ready = true;
+    }
+    public Filter getFilter() {
+    return filter;
+    }
+    public MetaAuditModel getOriginalModel() {
+    return model;
+    }
+    public TableModelSorter getSorter() {
+    return helper.getTableModelSorter();
+    }
+    public boolean isFiltered(int column) {
+    if(filter == null) {
+        return false;
+    }
+    return filter.isFiltered(column);
+    }
+    public void newModel(FileNode records[]) {
+    if(records == null || records.length == 0) {
+        return;
+    }
+    wait(true);
+    initial_state = true;
+    ///ystem.err.println("Build new Model - should only be called once per click!");
+    model = new MetaAuditModel(records);
+    setModel(model);
+    filter = new Filter(model.getColumnCount());
+    helper = new SortedTableHelper (this, filter, new DefaultTableModelSorter(), header_renderer, null);
+    helper.prepareTable();
+    // Add renderer to columns.
+    TableColumnModel column_model = getColumnModel();
+    for(int i = 0; i < column_model.getColumnCount(); i++) {
+        column_model.getColumn(i).setHeaderRenderer(header_renderer);
+    }
+    wait(false);
+    initial_state = false;
+    }
+    public void tableChanged(TableModelEvent e) {
+    wait(true);
+    super.tableChanged(e);
+    if(ready) {
                 // Create storage area
                 ArrayList heights[] = new ArrayList[dataModel.getRowCount()];
                 int widths_value[] = new int[dataModel.getColumnCount()];
                ArrayList widths[] = new ArrayList[dataModel.getColumnCount()];
+        ArrayList heights[] = new ArrayList[dataModel.getRowCount()];
+        int widths_value[] = new int[dataModel.getColumnCount()];
+        ArrayList widths[] = new ArrayList[dataModel.getColumnCount()];
                 // Iterate through cell values finding tallest and widest for each row and column respectively.
                 for(int j = 0; j < dataModel.getRowCount(); j++) {
                      for(int k = 0; k < dataModel.getColumnCount(); k++) {
                           Object object = dataModel.getValueAt(j, k);
                           if(object instanceof ArrayList) {
                                 ArrayList data = (ArrayList) object;
                                 if(heights[j] == null || data.size() > heights[j].size()) {
                                      heights[j] = data;
+                                }
                                 String longest = "";
                                 for(int i = 0; i < data.size(); i++) {
                                      String temp = data.get(i).toString();
                                      if(temp.length() > longest.length()) {
                                           longest = temp;
+                                     }
                                      temp = null;
+                                }
                                 if(widths[k] == null || longest.length() > widths_value[k]) {
                                      widths_value[k] = longest.length();
                                      widths[k] = data;
+                                }
                                 longest = null;
                                 data = null;
+                          }
+                     }
+                }
+        for(int j = 0; j < dataModel.getRowCount(); j++) {
+        for(int k = 0; k < dataModel.getColumnCount(); k++) {
+            Object object = dataModel.getValueAt(j, k);
+            if(object instanceof ArrayList) {
+            ArrayList data = (ArrayList) object;
+            if(heights[j] == null || data.size() > heights[j].size()) {
+                heights[j] = data;
+            }
+            String longest = "";
+            for(int i = 0; i < data.size(); i++) {
+                String temp = data.get(i).toString();
+                if(temp.length() > longest.length()) {
+                longest = temp;
+                }
+                temp = null;
+            }
+            if(widths[k] == null || longest.length() > widths_value[k]) {
+                widths_value[k] = longest.length();
+                widths[k] = data;
+            }
+            longest = null;
+            data = null;
+            }
+        }
+        }
                 // Now assign the dimensions we have determined to be the largest.
                 TableCellRenderer renderer = getDefaultRenderer(ArrayList.class);
                 for(int l = 0; l < heights.length; l++) {
                      if(heights[l] != null) {
                           Component component = renderer.getTableCellRendererComponent(this, heights[l], false, false, 0, 0);
                           Dimension size = component.getPreferredSize();
                           setRowHeight(l, size.height);
                           size = null;
                           component = null;
+                     }
+                }
                 heights = null;
                 for(int m = 0; m < widths.length; m++) {
                      if(widths[m] != null) {
                           Component component = renderer.getTableCellRendererComponent(this, widths[m], false, false, 0, 0);
                           Dimension size = component.getPreferredSize();
                           int width = size.width + MARGIN;
                           if(width > (2 * parent_frame.getSize().width) / 3) {
                                 width = (2 * parent_frame.getSize().width) / 3;
+                          }
                           Component header = header_renderer.getTableCellRendererComponent(this, dataModel.getColumnName(m), false, false, 0, 0);
                           if(header.getPreferredSize().width + MARGIN > width) {
                                 width = header.getPreferredSize().width + MARGIN;
+                          }
                           columnModel.getColumn(m).setPreferredWidth(width);
                           size = null;
                           component = null;
+                     }
+                }
                 widths = null;
                 renderer = null;
+          }
           wait(initial_state);
+     }
      public void sortOrderChanged(TableModelSorterEvent event) {
+     }
      private void wait(boolean waiting) {
           if(parent_frame != null) {
                 parent_frame.wait(waiting);
+          }
+     }
+        TableCellRenderer renderer = getDefaultRenderer(ArrayList.class);
+        for(int l = 0; l < heights.length; l++) {
+        if(heights[l] != null) {
+            Component component = renderer.getTableCellRendererComponent(this, heights[l], false, false, 0, 0);
+            Dimension size = component.getPreferredSize();
+            setRowHeight(l, size.height);
+            size = null;
+            component = null;
+        }
+        }
+        heights = null;
+        for(int m = 0; m < widths.length; m++) {
+        if(widths[m] != null) {
+            Component component = renderer.getTableCellRendererComponent(this, widths[m], false, false, 0, 0);
+            Dimension size = component.getPreferredSize();
+            int width = size.width + MARGIN;
+            if(width > (2 * parent_frame.getSize().width) / 3) {
+            width = (2 * parent_frame.getSize().width) / 3;
+            }
+            Component header = header_renderer.getTableCellRendererComponent(this, dataModel.getColumnName(m), false, false, 0, 0);
+            if(header.getPreferredSize().width + MARGIN > width) {
+            width = header.getPreferredSize().width + MARGIN;
+            }
+            columnModel.getColumn(m).setPreferredWidth(width);
+            size = null;
+            component = null;
+        }
+        }
+        widths = null;
+        renderer = null;
+    }
+    wait(initial_state);
+    }
+    public void sortOrderChanged(TableModelSorterEvent event) {
+    }
+    private void wait(boolean waiting) {
+    if(parent_frame != null) {
+        parent_frame.wait(waiting);
+    }
+    }
+}

trunk/gli/src/org/greenstone/gatherer/gui/table/GTable.java

-              r4293
+              r4366
 public class GTable
      extends JTable {
+    extends JTable {
      private boolean building = false;
      private JLabel label = null;
      public GTable() {
           // First draw the background image - tiled
           label = new JLabel("<HTML><FONT SIZE=5>Building Collection</FONT></HTML>");
           //label.setHorizontalAlignment(JLabel.CENTER);
           //label.setVerticalAlignment(JLabel.CENTER);
           //label.setSize(new Dimension(505, 200));
+     }
+    private boolean building = false;
+    private JLabel label = null;
+    public GTable() {
+    // First draw the background image - tiled
+    label = new JLabel("<HTML><FONT SIZE=5>Building Collection</FONT></HTML>");
+    //label.setHorizontalAlignment(JLabel.CENTER);
+    //label.setVerticalAlignment(JLabel.CENTER);
+    //label.setSize(new Dimension(505, 200));
+    }
      public synchronized void setBuilding(boolean building) {
           this.building = building;
           repaint();
+     }
+    public synchronized void setBuilding(boolean building) {
+    this.building = building;
+    repaint();
+    }
      public void paint(Graphics g) {
           // Now let the regular paint code do it's work
           super.paint(g);
           //if(building) {
                 label.paint(g);
+    public void paint(Graphics g) {
+    // Now let the regular paint code do it's work
+    super.paint(g);
+    //if(building) {
+    label.paint(g);
                 //}
+     }
+    }
+}

trunk/gli/src/org/greenstone/gatherer/gui/table/GTableCellEditor.java

-              r4293
+              r4366
  */
 public class GTableCellEditor
      extends DefaultCellEditor {
+    extends DefaultCellEditor {
      private Gatherer        gatherer      = null;
+    private Gatherer        gatherer      = null;
      private GComboBox      editor       = null;
+    private GComboBox      editor       = null;
      private GComboBoxModel editor_model = null;
+    private GComboBoxModel editor_model = null;
      /** The default constructor simply add the standard new argument, a
       * reference to the Gatherer class.
       * @param gatherer A reference to Gatherer for communication and dictionary
       * purposes.
       */
      public GTableCellEditor(Gatherer gatherer) {
           super(new JTextField());
           this.gatherer = gatherer;
+     }
+    /** The default constructor simply add the standard new argument, a
+     * reference to the Gatherer class.
+     * @param gatherer A reference to Gatherer for communication and dictionary
+     * purposes.
+     */
+    public GTableCellEditor(Gatherer gatherer) {
+    super(new JTextField());
+    this.gatherer = gatherer;
+    }
      /** This method returns the currently selected value of our editor
       * GCombobox.
       * @return An Object which is the selected items value.
       */
      public Object getCellEditorValue() {
           return editor.getSelectedItem();
+     }
+    /** This method returns the currently selected value of our editor
+     * GCombobox.
+     * @return An Object which is the selected items value.
+     */
+    public Object getCellEditorValue() {
+    return editor.getSelectedItem();
+    }
      /** Returns a reference to the editor GComboBox.
       * @return A Component reference to our editor.
       */
      public Component getComponent() {
           return editor;
+     }
+    /** Returns a reference to the editor GComboBox.
+     * @return A Component reference to our editor.
+     */
+    public Component getComponent() {
+    return editor;
+    }
      /** This method is called to retrieve the correct editor component for
       * a certain row and column within the target JTable. It is here that
       * we create the custom GComboBox for each row of the 'values' column
       * using a different model for each. If the call comes from any other
       * column (which it shouldn't but what the hell) we let the super
       * handle it which returns a plain old JTextField as the editing component.
       * @param table The JTable which called this method.
       * @param value The initial value of the cell this editor will be used
       * for, as an Object. Format this to suit the editor you wish to return.
       * @param isSelected A Boolean specifying whether the selected cell
       * is currently highlighted in such a way so as to allow the user to
       * know it is being edited.
       * @param row An Int specifying the cells row.
       * @param column An Int specifying the cells column.
       * @return A Component which will be placed in the table as the method
       * of editing the specified cell.
       */
      public Component getTableCellEditorComponent(JTable table, Object value,
                                                                  boolean isSelected, int row,
                                                                  int column) {
           GTableModel model = (GTableModel)table.getModel();
           // Create a new GComboBox with a model based on the selected
           // records metadata.
           Metadata selected_metadata = model.getMetadataAtRow(row);
           //editor_model = gatherer.c_man.getCollection().getValueModel
           //    (selected_metadata.element);
           editor = new GComboBox(editor_model);
           editor.setEditable(true);
           // Make sure that value is the currently selected option in the
           // editor.
           editor.setSelectedItem(value);
           // Done.
           return editor;
+     }
+    /** This method is called to retrieve the correct editor component for
+     * a certain row and column within the target JTable. It is here that
+     * we create the custom GComboBox for each row of the 'values' column
+     * using a different model for each. If the call comes from any other
+     * column (which it shouldn't but what the hell) we let the super
+     * handle it which returns a plain old JTextField as the editing component.
+     * @param table The JTable which called this method.
+     * @param value The initial value of the cell this editor will be used
+     * for, as an Object. Format this to suit the editor you wish to return.
+     * @param isSelected A Boolean specifying whether the selected cell
+     * is currently highlighted in such a way so as to allow the user to
+     * know it is being edited.
+     * @param row An Int specifying the cells row.
+     * @param column An Int specifying the cells column.
+     * @return A Component which will be placed in the table as the method
+     * of editing the specified cell.
+     */
+    public Component getTableCellEditorComponent(JTable table, Object value,
+                         boolean isSelected, int row,
+                         int column) {
+    GTableModel model = (GTableModel)table.getModel();
+    // Create a new GComboBox with a model based on the selected
+    // records metadata.
+    Metadata selected_metadata = model.getMetadataAtRow(row);
+    //editor_model = gatherer.c_man.getCollection().getValueModel
+    //  (selected_metadata.element);
+    editor = new GComboBox(editor_model);
+    editor.setEditable(true);
+    // Make sure that value is the currently selected option in the
+    // editor.
+    editor.setSelectedItem(value);
+    // Done.
+    return editor;
+    }
+}

trunk/gli/src/org/greenstone/gatherer/gui/table/GTableModel.java

-              r4350
+              r4366
  */
 public class GTableModel
      extends AbstractTableModel
      implements MSMListener {
      /** The source for the data currently shown in the table. May be any of the other three metadata lists, or the union of all of them. */
      private ArrayList current_metadata    = new ArrayList();
      /** The metadata currently assigned at the file level. */
      private ArrayList file_metadata       = null; // new ArrayList();
      /** The metadata currently assigned at the folder level. */
      private ArrayList inherited_metadata  = null; // new ArrayList();
      /** The metadata currently unassigned. */
      private ArrayList unassigned_metadata = null; // new ArrayList();
      /** The file nodes this model is built upon. */
      private FileNode[] file_nodes;
      /** The current view. */
      //private int current_view;
+    extends AbstractTableModel
+    implements MSMListener {
+    /** The source for the data currently shown in the table. May be any of the other three metadata lists, or the union of all of them. */
+    private ArrayList current_metadata    = new ArrayList();
+    /** The metadata currently assigned at the file level. */
+    private ArrayList file_metadata       = null; // new ArrayList();
+    /** The metadata currently assigned at the folder level. */
+    private ArrayList inherited_metadata  = null; // new ArrayList();
+    /** The metadata currently unassigned. */
+    private ArrayList unassigned_metadata = null; // new ArrayList();
+    /** The file nodes this model is built upon. */
+    private FileNode[] file_nodes;
+    /** The current view. */
+    //private int current_view;
      //private JToggleButton assigned_metadata_view;
 …
      //private JProgressBar activity_bar;
      /** The table this model is being displayed in. */
      private JTable table;
      private ModelBuilder builder;
      static final public int SHOW_ALL         = 0;
      static final public int SHOW_ASSIGNED    = 1;
      static final public int SHOW_FILE        = 2;
      static final public int SHOW_INHERITED   = 3;
      static final public int SHOW_UNASSIGNED  = 4;
      static final private String[] COLUMN_NAMES = {"", Gatherer.dictionary.get("Metadata.Element"),  Gatherer.dictionary.get("Metadata.Value")};
      public GTableModel(JTable table) {
           this.builder = null;
           this.file_metadata = current_metadata;
           this.inherited_metadata = current_metadata;
           this.table = table;
           this.unassigned_metadata = current_metadata;
           //changeView();
           // Register this model with the msm manager.
           if(Gatherer.c_man.ready()) {
                 Gatherer.c_man.getCollection().msm.addMSMListener(this);
+          }
+     }
      public GTableModel(JTable table, FileNode[] file_nodes) {
           this(table);
           this.file_nodes = file_nodes;
           if(file_nodes != null && file_nodes.length > 0) {
+    private JTable table;
+    private ModelBuilder builder;
+    static final public int SHOW_ALL         = 0;
+    static final public int SHOW_ASSIGNED    = 1;
+    static final public int SHOW_FILE        = 2;
+    static final public int SHOW_INHERITED   = 3;
+    static final public int SHOW_UNASSIGNED  = 4;
+    static final private String[] COLUMN_NAMES = {"", Gatherer.dictionary.get("Metadata.Element"),  Gatherer.dictionary.get("Metadata.Value")};
+    public GTableModel(JTable table) {
+    this.builder = null;
+    this.file_metadata = current_metadata;
+    this.inherited_metadata = current_metadata;
+    this.table = table;
+    this.unassigned_metadata = current_metadata;
+    //changeView();
+    // Register this model with the msm manager.
+    if(Gatherer.c_man.ready()) {
+        Gatherer.c_man.getCollection().msm.addMSMListener(this);
+    }
+    }
+    public GTableModel(JTable table, FileNode[] file_nodes) {
+    this(table);
+    this.file_nodes = file_nodes;
+    if(file_nodes != null && file_nodes.length > 0) {
                 // Create model builder
                 builder = new ModelBuilder();
                 builder.start();
+          }
+     }
      /** The default constructor creates a new empty model with the current view set to an emtpy 'all metadata'. */
      /*
         public GTableModel(JTable table, JToggleButton assigned_metadata_view, JToggleButton unassigned_metadata_view, JProgressBar activity_bar) {
           this.activity_bar = activity_bar;
           this.assigned_metadata_view = assigned_metadata_view;
           this.builder = null;
           this.table = table;
           this.unassigned_metadata_view = unassigned_metadata_view;
           changeView();
           // Register this model with the msm manager.
           if(Gatherer.c_man.ready()) {
                 Gatherer.c_man.getCollection().msm.addMSMListener(this);
+          }
+        }
      */
+        builder = new ModelBuilder();
+        builder.start();
+    }
+    }
+    /** The default constructor creates a new empty model with the current view set to an emtpy 'all metadata'. */
+    /*
+      public GTableModel(JTable table, JToggleButton assigned_metadata_view, JToggleButton unassigned_metadata_view, JProgressBar activity_bar) {
+      this.activity_bar = activity_bar;
+      this.assigned_metadata_view = assigned_metadata_view;
+      this.builder = null;
+      this.table = table;
+      this.unassigned_metadata_view = unassigned_metadata_view;
+      changeView();
+      // Register this model with the msm manager.
+      if(Gatherer.c_man.ready()) {
+      Gatherer.c_man.getCollection().msm.addMSMListener(this);
+      }
+      }
+    */
      /** This constuctor starts by creating an empty model then, using a separate model builder thread, builds a model from the given files. */
 …
      */
      public void changeView() {
           changeView(SHOW_ALL);
+     }
      /*
+    public void changeView() {
+    changeView(SHOW_ALL);
+    }
+    /*
      public void changeView() {
           boolean show_assigned = assigned_metadata_view.isSelected();
 …
      /** Change the current view by changing the model that the table is currently based on. */
      public void changeView(int view) {
           //current_view = view;
           /*
           switch(view) {
           case SHOW_ASSIGNED:
+    public void changeView(int view) {
+    //current_view = view;
+    /*
+      switch(view) {
+      case SHOW_ASSIGNED:
                 ///ystem.err.println("Show assigned");
                 current_metadata = new ArrayList();
 …
                 Collections.sort(current_metadata, MSMUtils.METADATA_COMPARATOR);
                 break;
           case SHOW_FILE:
+                case SHOW_FILE:
                 ///ystem.err.println("Show file");
                 current_metadata = file_metadata;
                 break;
           case SHOW_INHERITED:
+                case SHOW_INHERITED:
                 ///ystem.err.println("Show inherited");
                 current_metadata = inherited_metadata;
                 break;
           case SHOW_UNASSIGNED:
+                case SHOW_UNASSIGNED:
                 ///ystem.err.println("Show unassigned");
                 current_metadata = unassigned_metadata;
                 break;
           default:
+                default:
                 // SHOW_ALL
                 System.err.println("Show all");
 …
                 current_metadata.addAll(unassigned_metadata);
                 Collections.sort(current_metadata, MSMUtils.METADATA_COMPARATOR);
+          }
           // Inform everyone that the model has changed.
           fireTableDataChanged();
           */
+     }
      /** Called whenever an element in a set is added, edited or removed from the metadata set manager. We listen for this just incase the name of one of the elements currently shown changes. After that the table will be up to date, as the element references are otherwise live. */
      public void elementChanged(MSMEvent event) {
           MSMAction profile = event.getProfile();
           if(profile != null) {
+                }
+                // Inform everyone that the model has changed.
+                fireTableDataChanged();
+    */
+    }
+    /** Called whenever an element in a set is added, edited or removed from the metadata set manager. We listen for this just incase the name of one of the elements currently shown changes. After that the table will be up to date, as the element references are otherwise live. */
+    public void elementChanged(MSMEvent event) {
+    MSMAction profile = event.getProfile();
+    if(profile != null) {
                 // Retrieve the elements new name (thats hopefully what will be returned by getValue()).
                 String name = profile.getTarget();
                 int row = 0;
                 for( ; row < current_metadata.size(); row++) {
                      if(getValueAt(row, 0).equals(name)) {
                           fireTableCellUpdated(row, 0);
+                     }
+                }
                 name = null;
+          }
           profile = null;
           event = null;
+     }
      /** Returns the number of columns in this table. */
      public int getColumnCount() {
           return COLUMN_NAMES.length;
+     }
      /** Returns the data class of the specified column. */
      public Class getColumnClass(int col) {
           if(col == 2) {
                 return JButton.class;
+          }
           return String.class;
+     }
      /** Retrieves the name of the specified column. */
      public String getColumnName(int col) {
           return COLUMN_NAMES[col];
+     }
      /* Called to retrieve the Metadata record that matches a certain row. Usually caused by the user selectiong a row in the table. It synchronized so that the model doesn't up and change while we're trying to retrieve the indicated element. */
      public synchronized Metadata getMetadataAtRow(int row) {
           if(0 <= row && row < current_metadata.size()) {
                 return (Metadata) current_metadata.get(row);
+          }
           return null;
+     }
      /** Returns the number of rows in this table. */
      public int getRowCount() {
           return current_metadata.size();
+     }
      /** Returns the cell value at a given row and column as an Object. */
      public Object getValueAt(int row, int col) {
           Object result = "";
           if(0 <= row && row < current_metadata.size()) {
                 Metadata m = (Metadata) current_metadata.get(row);
                 if(0 <= col && col < COLUMN_NAMES.length) {
                      switch(col) {
                      case 0:
                           if(!m.isFileLevel()) {
                                 result = m.getFile();
+                          }
                           break;
                      case 1:
                           ElementWrapper element = m.getElement();
                           if(element != null) {
                                 result = element.toString();
+                          }
                           break;
                      case 2:
                           result = m.getValue();
                           break;
                      case 3:
                           result = (m.isFileLevel() ? "true" : "false");
                           break;
+                     }
+                }
+          }
           return result;
+     }
+        String name = profile.getTarget();
+        int row = 0;
+        for( ; row < current_metadata.size(); row++) {
+        if(getValueAt(row, 0).equals(name)) {
+            fireTableCellUpdated(row, 0);
+        }
+        }
+        name = null;
+    }
+    profile = null;
+    event = null;
+    }
+    /** Returns the number of columns in this table. */
+    public int getColumnCount() {
+    return COLUMN_NAMES.length;
+    }
+    /** Returns the data class of the specified column. */
+    public Class getColumnClass(int col) {
+    if(col == 2) {
+        return JButton.class;
+    }
+    return String.class;
+    }
+    /** Retrieves the name of the specified column. */
+    public String getColumnName(int col) {
+    return COLUMN_NAMES[col];
+    }
+    /* Called to retrieve the Metadata record that matches a certain row. Usually caused by the user selectiong a row in the table. It synchronized so that the model doesn't up and change while we're trying to retrieve the indicated element. */
+    public synchronized Metadata getMetadataAtRow(int row) {
+    if(0 <= row && row < current_metadata.size()) {
+        return (Metadata) current_metadata.get(row);
+    }
+    return null;
+    }
+    /** Returns the number of rows in this table. */
+    public int getRowCount() {
+    return current_metadata.size();
+    }
+    /** Returns the cell value at a given row and column as an Object. */
+    public Object getValueAt(int row, int col) {
+    Object result = "";
+    if(0 <= row && row < current_metadata.size()) {
+        Metadata m = (Metadata) current_metadata.get(row);
+        if(0 <= col && col < COLUMN_NAMES.length) {
+        switch(col) {
+        case 0:
+            if(!m.isFileLevel()) {
+            result = m.getFile();
+            }
+            break;
+        case 1:
+            ElementWrapper element = m.getElement();
+            if(element != null) {
+            result = element.toString();
+            }
+            break;
+        case 2:
+            result = m.getValue();
+            break;
+        case 3:
+            result = (m.isFileLevel() ? "true" : "false");
+            break;
+        }
+        }
+    }
+    return result;
+    }
      /** Allows access to this models current view. */
      public int getView() {
           return SHOW_ALL; //current_view;
+     }
      /** Determine if the given metadata is common to all selected file nodes given the context of the current view. */
      public boolean isCommon(int row) {
           if(0 <= row && row < current_metadata.size()) {
                 Metadata entry = (Metadata) current_metadata.get(row);
+    /** Allows access to this models current view. */
+    public int getView() {
+    return SHOW_ALL; //current_view;
+    }
+    /** Determine if the given metadata is common to all selected file nodes given the context of the current view. */
+    public boolean isCommon(int row) {
+    if(0 <= row && row < current_metadata.size()) {
+        Metadata entry = (Metadata) current_metadata.get(row);
                 ///ystem.err.println("There are " + file_nodes.length + " selected files.");
                 ///ystem.err.println("This metadata is attached to " + entry.getCount() + " of them.");
                 if(entry.getCount() == file_nodes.length) {
                      return true;
+                }
+          }
           return false;
+     }
      /** Whenever there is a metadata change we must determine if there are any changes to our various lists of metadata, and also if there is any need to refresh the table currently being viewed. */
      public void metadataChanged(MSMEvent event) {
           FileNode file_node = event.getRecord();
           ///ystem.err.println("File node effected");
           // First check whether this record is one of those that we have showing.
           if(file_nodes != null && file_node != null && ArrayTools.contains(file_nodes, file_node)) {
+        if(entry.getCount() == file_nodes.length) {
+        return true;
+        }
+    }
+    return false;
+    }
+    /** Whenever there is a metadata change we must determine if there are any changes to our various lists of metadata, and also if there is any need to refresh the table currently being viewed. */
+    public void metadataChanged(MSMEvent event) {
+    FileNode file_node = event.getRecord();
+    ///ystem.err.println("File node effected");
+    // First check whether this record is one of those that we have showing.
+    if(file_nodes != null && file_node != null && ArrayTools.contains(file_nodes, file_node)) {
                 // Brute force solution... rebuild the table.
                 if(file_nodes != null && file_nodes.length > 0) {
                      current_metadata.clear();
                      // Create model builder
                      builder = new ModelBuilder();
                      builder.start();
+                }
+        if(file_nodes != null && file_nodes.length > 0) {
+        current_metadata.clear();
+        // Create model builder
+        builder = new ModelBuilder();
+        builder.start();
+        }
                 /*
                 // If old metadata has been removed then remove it. Update the unassigned list if necessary (first checking if there are other metadata entries with the same element, and furthermore if the were inherited metadata being supressed).
                 if(old_data != null) {
                      System.err.println("Remove: " + old_data);
                      // Determine the level of this metadata
                      ArrayList modified_metadata = null;
                      if(old_data.isFileLevel()) {
                           modified_metadata = file_metadata;
+                     }
                      else {
                           modified_metadata = inherited_metadata;
+                     }
+                System.err.println("Remove: " + old_data);
+                // Determine the level of this metadata
+                ArrayList modified_metadata = null;
+                if(old_data.isFileLevel()) {
+                modified_metadata = file_metadata;
+                }
+                else {
+                modified_metadata = inherited_metadata;
+                }
                      int index = -1;
                      if((index = modified_metadata.indexOf(old_data)) != -1) {
                           Metadata data = (Metadata) modified_metadata.get(index);
                           data.dec();
                           // If we just removed the last occurance of this metadata, delete it
                           if(data.getCount() == 0) {
                                 remove(modified_metadata, data);
                                 // If there are no further occurances of the element of this entry, add entry to unassigned_metadata.
                                 boolean found = false;
                                 ElementWrapper element = data.getElement();
                                 // Search the current metadata
                                 for(int i = 0; i < modified_metadata.size(); i++) {
                                      Metadata sibling = (Metadata) modified_metadata.get(i);
                                      if(sibling.getElement().equals(element)) {
                                           found = true;
+                                     }
+                                }
                                 // And the inherited metadata if we haven't already
                                 if(modified_metadata != inherited_metadata) {
                                      for(int i = 0; !found && i < inherited_metadata.size(); i++) {
                                           Metadata sibling = (Metadata) inherited_metadata.get(i);
                                           if(sibling.getElement().equals(element)) {
                                                 found = true;
+                                          }
+                                     }
+                                }
                                 // If we get this far and still haven't found a match then we do something very tricky. We retrieve all of the metadata for the parent file and notice any inherited nodes that were previously overwritten by the metadata entry we removed. The reason we use the parent is that we can't just assume that the GDMDocument changes occured before this method was called. Thus our about-to-be-removed overwritting metadata may still be in effect if we just called getMetadata for this file.
                                 if(!found) {
                                      ArrayList parent_metadatum = Gatherer.c_man.getCollection().gdm.getMetadata((file_node.getFile()).getParentFile());
                                      // For each piece of parent metadata
                                      for(int i = parent_metadatum.size(); i > 0; i--) {
                                           Metadata parent_metadata = (Metadata) parent_metadatum.get(i - 1);
                                           // If we found some previously suppressed metadata then add it and say we found something.
                                           if(!inherited_metadata.contains(parent_metadata)) {
                                                 ///ystem.err.println("Restoring overwritten inherited metadata: " + parent_metadata);
                                                 found = true;
                                                 parent_metadata.setCount(1);
                                                 parent_metadata.setFileLevel(false); // Has to be folder level doesn't it.
                                                 add(inherited_metadata, parent_metadata);
+                                          }
+                                     }
                                      // Run this getMetadata again to restore all of the file level and source file entries (they would have changed to reflect the parents call.
                                      Gatherer.c_man.getCollection().gdm.getMetadata(file_node.getFile());
+                                }
                                 // And only then, if we haven't found a substitute, may we add a null metadata.
                                 if(!found) {
                                      add(unassigned_metadata, new Metadata(data.getElement()));
+                                }
+                          }
+                     }
+                int index = -1;
+                if((index = modified_metadata.indexOf(old_data)) != -1) {
+                Metadata data = (Metadata) modified_metadata.get(index);
+                data.dec();
+                // If we just removed the last occurance of this metadata, delete it
+                if(data.getCount() == 0) {
+                remove(modified_metadata, data);
+                // If there are no further occurances of the element of this entry, add entry to unassigned_metadata.
+                boolean found = false;
+                ElementWrapper element = data.getElement();
+                // Search the current metadata
+                for(int i = 0; i < modified_metadata.size(); i++) {
+                Metadata sibling = (Metadata) modified_metadata.get(i);
+                if(sibling.getElement().equals(element)) {
+                found = true;
+                }
+                }
+                // And the inherited metadata if we haven't already
+                if(modified_metadata != inherited_metadata) {
+                for(int i = 0; !found && i < inherited_metadata.size(); i++) {
+                Metadata sibling = (Metadata) inherited_metadata.get(i);
+                if(sibling.getElement().equals(element)) {
+                found = true;
+                }
+                }
+                }
+                // If we get this far and still haven't found a match then we do something very tricky. We retrieve all of the metadata for the parent file and notice any inherited nodes that were previously overwritten by the metadata entry we removed. The reason we use the parent is that we can't just assume that the GDMDocument changes occured before this method was called. Thus our about-to-be-removed overwritting metadata may still be in effect if we just called getMetadata for this file.
+                if(!found) {
+                ArrayList parent_metadatum = Gatherer.c_man.getCollection().gdm.getMetadata((file_node.getFile()).getParentFile());
+                // For each piece of parent metadata
+                for(int i = parent_metadatum.size(); i > 0; i--) {
+                Metadata parent_metadata = (Metadata) parent_metadatum.get(i - 1);
+                // If we found some previously suppressed metadata then add it and say we found something.
+                if(!inherited_metadata.contains(parent_metadata)) {
+                ///ystem.err.println("Restoring overwritten inherited metadata: " + parent_metadata);
+                found = true;
+                parent_metadata.setCount(1);
+                parent_metadata.setFileLevel(false); // Has to be folder level doesn't it.
+                add(inherited_metadata, parent_metadata);
+                }
+                }
+                // Run this getMetadata again to restore all of the file level and source file entries (they would have changed to reflect the parents call.
+                Gatherer.c_man.getCollection().gdm.getMetadata(file_node.getFile());
+                }
+                // And only then, if we haven't found a substitute, may we add a null metadata.
+                if(!found) {
+                add(unassigned_metadata, new Metadata(data.getElement()));
+                }
+                }
+                }
+                }
                 // If new metadata has been assigned, remove its entry from the unassigned metadata list. Furthermore add the new entry to either the file or folder metadata list depending on its level. Remember to rebuild the common metadata lists.
                 if(new_data != null) {
                      ///ystem.err.println("Add: " + new_data);
                      // Create dummy 'unassigned' metadata from the new metadata and remove it from the unassigned list (if its even there)
                      remove(unassigned_metadata, new Metadata(new_data.getElement()));
                      // Determine if we are adding the new node at the file or folder level.
                      ArrayList modified_metadata = null;
                      if(new_data.isFileLevel()) {
                           modified_metadata = file_metadata;
                           // If its file metadata, and its set to overwrite, then we need to remove any row it would overwrite.
                           if(new_data.accumulates()) {
                                 // All good.
+                          }
                           else {
                                 // Remove any entries in the inherited_metadata that would be overwritten
                                 ElementWrapper element = new_data.getElement();
                                 for(int i = 0; i < inherited_metadata.size(); i++) {
                                      Metadata sibling = (Metadata) inherited_metadata.get(i);
                                      if(sibling.getElement().equals(element)) {
                                           inherited_metadata.remove(sibling);
+                                     }
+                                }
+                          }
+                     }
                      else {
                           modified_metadata = inherited_metadata;
+                     }
                      // And add it.
                      int index = -1;
                      if((index = modified_metadata.indexOf(new_data)) == -1) {
                           add(modified_metadata, new_data);
                           new_data.setCount(1);
+                     }
                      else {
                           Metadata data = (Metadata) modified_metadata.get(index);
                           data.inc();
                           data = null;
+                     }
                      modified_metadata = null;
+                ///ystem.err.println("Add: " + new_data);
+                // Create dummy 'unassigned' metadata from the new metadata and remove it from the unassigned list (if its even there)
+                remove(unassigned_metadata, new Metadata(new_data.getElement()));
+                // Determine if we are adding the new node at the file or folder level.
+                ArrayList modified_metadata = null;
+                if(new_data.isFileLevel()) {
+                modified_metadata = file_metadata;
+                // If its file metadata, and its set to overwrite, then we need to remove any row it would overwrite.
+                if(new_data.accumulates()) {
+                // All good.
+                }
+                else {
+                // Remove any entries in the inherited_metadata that would be overwritten
+                ElementWrapper element = new_data.getElement();
+                for(int i = 0; i < inherited_metadata.size(); i++) {
+                Metadata sibling = (Metadata) inherited_metadata.get(i);
+                if(sibling.getElement().equals(element)) {
+                inherited_metadata.remove(sibling);
+                }
+                }
+                }
+                }
+                else {
+                modified_metadata = inherited_metadata;
+                }
+                // And add it.
+                int index = -1;
+                if((index = modified_metadata.indexOf(new_data)) == -1) {
+                add(modified_metadata, new_data);
+                new_data.setCount(1);
+                }
+                else {
+                Metadata data = (Metadata) modified_metadata.get(index);
+                data.inc();
+                data = null;
+                }
+                modified_metadata = null;
+                }
                 // As a current visible table is most likely affected, update the table component. We do this by calling changeView so as to also update any compound list.
                 //changeView(current_view);
                 */
+          }
           else {
+    }
+    else {
                 ///ystem.err.println("FileNodes = " + file_nodes);
                 ///ystem.err.println("FileNode = " + file_node);
+          }
+     }
      /** Called whenever a set is added or removed from the metadata set manager. */
      public void setChanged(MSMEvent event) {
           // No, don't care. Still don't care. Couldn't care less.
+     }
      public Rectangle setSelectedMetadata(Metadata data) {
           Rectangle bounds = null;
           if (builder != null) {
               if(builder.complete) {
               for(int i = 0; i < getRowCount(); i++) {
                   if(getMetadataAtRow(i).equals(data)) {
                   ///ystem.err.println("Found matching metadata at row " + i + " (of " + getRowCount() + " rows)");
                   ///ystem.err.println("Table shows " + table.getRowCount() + " rows!");
                   bounds = table.getCellRect(i, 0, true);
                   table.scrollRectToVisible(bounds);
                   table.setRowSelectionInterval(i, i);
+                  }
+              }
+              }
               else {
               builder.selected_metadata = data;
+              }
+          }
           return bounds;
+     }
      public int size() {
           return file_nodes.length;
+     }
      /** Called when the value tree of a certain element has changed significantly but, although we display metadata values, we only care about those coming through metadataChanged() events. */
      public void valueChanged(MSMEvent event) {
           // Don't care. Tra-la-la-la-la.
+     }
      /** Alphabetically inserts the new_metadata in the target vector. */
      private int add(ArrayList target, Metadata new_metadata) {
           int i = 0;
           while(i < target.size()) {
                 Metadata current = (Metadata)target.get(i);
                 if(current.compareTo(new_metadata) > 0) {
                      target.add(i, new_metadata);
                      return i;
+                }
                 i++;
+          }
           target.add(new_metadata);
           return i;
+     }
      /** Remove a certain piece of data from a certain vector. */
      private void remove(ArrayList target, Metadata old_metadata) {
           if(target != null) {
                 for(int i = 0; i < target.size(); i++) {
                      Metadata current_metadata = (Metadata) target.get(i);
                      if(current_metadata.equals(old_metadata)) {
                           target.remove(current_metadata);
                           return;
+                     }
+                }
+          }
+     }
      private class ModelBuilder
           extends Thread {
           public boolean had_warning = false;
           public boolean complete = false;
           public Metadata selected_metadata = null;;
+    }
+    }
+    /** Called whenever a set is added or removed from the metadata set manager. */
+    public void setChanged(MSMEvent event) {
+    // No, don't care. Still don't care. Couldn't care less.
+    }
+    public Rectangle setSelectedMetadata(Metadata data) {
+    Rectangle bounds = null;
+    if (builder != null) {
+        if(builder.complete) {
+        for(int i = 0; i < getRowCount(); i++) {
+            if(getMetadataAtRow(i).equals(data)) {
+            ///ystem.err.println("Found matching metadata at row " + i + " (of " + getRowCount() + " rows)");
+            ///ystem.err.println("Table shows " + table.getRowCount() + " rows!");
+            bounds = table.getCellRect(i, 0, true);
+            table.scrollRectToVisible(bounds);
+            table.setRowSelectionInterval(i, i);
+            }
+        }
+        }
+        else {
+        builder.selected_metadata = data;
+        }
+    }
+    return bounds;
+    }
+    public int size() {
+    return file_nodes.length;
+    }
+    /** Called when the value tree of a certain element has changed significantly but, although we display metadata values, we only care about those coming through metadataChanged() events. */
+    public void valueChanged(MSMEvent event) {
+    // Don't care. Tra-la-la-la-la.
+    }
+    /** Alphabetically inserts the new_metadata in the target vector. */
+    private int add(ArrayList target, Metadata new_metadata) {
+    int i = 0;
+    while(i < target.size()) {
+        Metadata current = (Metadata)target.get(i);
+        if(current.compareTo(new_metadata) > 0) {
+        target.add(i, new_metadata);
+        return i;
+        }
+        i++;
+    }
+    target.add(new_metadata);
+    return i;
+    }
+    /** Remove a certain piece of data from a certain vector. */
+    private void remove(ArrayList target, Metadata old_metadata) {
+    if(target != null) {
+        for(int i = 0; i < target.size(); i++) {
+        Metadata current_metadata = (Metadata) target.get(i);
+        if(current_metadata.equals(old_metadata)) {
+            target.remove(current_metadata);
+            return;
+        }
+        }
+    }
+    }
+    private class ModelBuilder
+    extends Thread {
+    public boolean had_warning = false;
+    public boolean complete = false;
+    public Metadata selected_metadata = null;;
           public void run() {
                 Vector elements = Gatherer.c_man.getCollection().msm.getElements();
+    public void run() {
+        Vector elements = Gatherer.c_man.getCollection().msm.getElements();
                 // Show some visual indication that building is occuring.
                 //assigned_metadata_view.setEnabled(false);
 …
                 //long start = System.currentTimeMillis();
                 ArrayList known_elements = new ArrayList(); // Elements that have metadata assigned.
                 for(int i = 0; i < file_nodes.length; i++) {
                      File current_file = file_nodes[i].getFile();
                      // The current assigned metadata for this file.
                      ArrayList metadatum = Gatherer.c_man.getCollection().gdm.getAllMetadata(current_file);
                      for(int j = 0; j < metadatum.size(); j++) {
                           Metadata data = (Metadata) metadatum.get(j);
                           // Determine the target list by the metadata level
                           ArrayList modified_metadata;
                           if(data.isFileLevel()) {
                                 modified_metadata = file_metadata;
+                          }
                           else {
                                 showInheritedMetadataWarning();
                                 modified_metadata = inherited_metadata;
+                          }
                           int index = -1;
                           // Don't show hidden metadata
                           // If the given metadata already exists in our list of modified metadata then increment its commonality count.
                           if((index = modified_metadata.indexOf(data)) != -1) {
                                 data = (Metadata) modified_metadata.get(index);
                                 ///ystem.err.println("Increasing count:" + element);
                                 data.inc();
                                 // If the table shown is stale, refresh it.
                                 //if((modified_metadata == file_metadata && current_view == SHOW_FILE) || (modified_metadata == inherited_metadata && current_view == SHOW_INHERITED)) {
                                 // fireTableRowsUpdated(index, index);
                                 //}
                                 // We may have to update a compound list
                                 //else if(current_view == SHOW_ALL || current_view == SHOW_ASSIGNED) {
                                 if((index = current_metadata.indexOf(data)) == -1) {
                                      fireTableRowsUpdated(index, index);
+                                }
                                 //}
+                          }
                           // Ensure the metadata's element is in our list of showable elements.
                           else if(contains(elements, data.getElement())) {
                                 ///ystem.err.println("Setting count to one: " + element);
                                 data.setCount(1);
                                 index = add(modified_metadata, data); // Add to assigned metadata.
                                 known_elements.add(data.getElement());
                                 // If the table shown is stale, refresh it.
                                 //if((modified_metadata == file_metadata && current_view == SHOW_FILE) || (modified_metadata == inherited_metadata && current_view == SHOW_INHERITED)) {
                                 //   fireTableRowsInserted(index, index);
                                 //}
                                 // We may have to update a compound list
                                 //else if(current_view == SHOW_ALL || current_view == SHOW_ASSIGNED) {
                                 if((index = current_metadata.indexOf(data)) == -1) {
                                      index = add(current_metadata, data);
                                      fireTableRowsInserted(index, index);
+                                }
                                 else {
                                      fireTableRowsUpdated(index, index);
+                                }
                                 //}
+                          }
                           else {
                                 ///ystem.err.println("No.\n***** Cannot match element so it must be hidden, right? *****");
+                          }
+                     }
                      //activity_bar.setValue(activity_bar.getValue() + 1);
                      Gatherer.g_man.metaedit_pane.validateMetadataTable();
+                }
+        ArrayList known_elements = new ArrayList(); // Elements that have metadata assigned.
+        for(int i = 0; i < file_nodes.length; i++) {
+        File current_file = file_nodes[i].getFile();
+        // The current assigned metadata for this file.
+        ArrayList metadatum = Gatherer.c_man.getCollection().gdm.getAllMetadata(current_file);
+        for(int j = 0; j < metadatum.size(); j++) {
+            Metadata data = (Metadata) metadatum.get(j);
+            // Determine the target list by the metadata level
+            ArrayList modified_metadata;
+            if(data.isFileLevel()) {
+            modified_metadata = file_metadata;
+            }
+            else {
+            showInheritedMetadataWarning();
+            modified_metadata = inherited_metadata;
+            }
+            int index = -1;
+            // Don't show hidden metadata
+            // If the given metadata already exists in our list of modified metadata then increment its commonality count.
+            if((index = modified_metadata.indexOf(data)) != -1) {
+            data = (Metadata) modified_metadata.get(index);
+            ///ystem.err.println("Increasing count:" + element);
+            data.inc();
+            // If the table shown is stale, refresh it.
+            //if((modified_metadata == file_metadata && current_view == SHOW_FILE) || (modified_metadata == inherited_metadata && current_view == SHOW_INHERITED)) {
+            // fireTableRowsUpdated(index, index);
+            //}
+            // We may have to update a compound list
+            //else if(current_view == SHOW_ALL || current_view == SHOW_ASSIGNED) {
+            if((index = current_metadata.indexOf(data)) == -1) {
+                fireTableRowsUpdated(index, index);
+            }
+            //}
+            }
+            // Ensure the metadata's element is in our list of showable elements.
+            else if(contains(elements, data.getElement())) {
+            ///ystem.err.println("Setting count to one: " + element);
+            data.setCount(1);
+            index = add(modified_metadata, data); // Add to assigned metadata.
+            known_elements.add(data.getElement());
+            // If the table shown is stale, refresh it.
+            //if((modified_metadata == file_metadata && current_view == SHOW_FILE) || (modified_metadata == inherited_metadata && current_view == SHOW_INHERITED)) {
+            //   fireTableRowsInserted(index, index);
+            //}
+            // We may have to update a compound list
+            //else if(current_view == SHOW_ALL || current_view == SHOW_ASSIGNED) {
+            if((index = current_metadata.indexOf(data)) == -1) {
+                index = add(current_metadata, data);
+                fireTableRowsInserted(index, index);
+            }
+            else {
+                fireTableRowsUpdated(index, index);
+            }
+            //}
+            }
+            else {
+            ///ystem.err.println("No.\n***** Cannot match element so it must be hidden, right? *****");
+            }
+        }
+        //activity_bar.setValue(activity_bar.getValue() + 1);
+        Gatherer.g_man.metaedit_pane.validateMetadataTable();
+        }
                 // Add entries for the currently unassigned metadata. You can determine these as the difference between elements and known_elements.
                 for(int k = 0; k < elements.size(); k++) {
                      // For each key.
                      ElementWrapper element = (ElementWrapper) elements.get(k);
                      if(!known_elements.contains(element)) {
                           Metadata data = new Metadata(element);
                           int index = add(unassigned_metadata, data);
                           // Inform everyone that the model has changed, but only if it affects the current view.
                           //if(current_view == SHOW_UNASSIGNED) {
                           //    fireTableRowsInserted(index, index);
                           //}
                           //else if(current_view == SHOW_ALL) {
                           if((index = current_metadata.indexOf(data)) == -1) {
                                 index = add(current_metadata, data);
                                 fireTableRowsInserted(index, index);
+                          }
                           else {
                                 fireTableRowsUpdated(index, index);
+                          }
                           //}
+                     }
                      //activity_bar.setValue(activity_bar.getValue() + 1);
                      Gatherer.g_man.metaedit_pane.validateMetadataTable();
+                }
+        for(int k = 0; k < elements.size(); k++) {
+        // For each key.
+        ElementWrapper element = (ElementWrapper) elements.get(k);
+        if(!known_elements.contains(element)) {
+            Metadata data = new Metadata(element);
+            int index = add(unassigned_metadata, data);
+            // Inform everyone that the model has changed, but only if it affects the current view.
+            //if(current_view == SHOW_UNASSIGNED) {
+            //  fireTableRowsInserted(index, index);
+            //}
+            //else if(current_view == SHOW_ALL) {
+            if((index = current_metadata.indexOf(data)) == -1) {
+            index = add(current_metadata, data);
+            fireTableRowsInserted(index, index);
+            }
+            else {
+            fireTableRowsUpdated(index, index);
+            }
+            //}
+        }
+        //activity_bar.setValue(activity_bar.getValue() + 1);
+        Gatherer.g_man.metaedit_pane.validateMetadataTable();
+        }
                 //long end = System.currentTimeMillis();
                 ///ystem.err.println("Took " + (end - start) + "ms to build table.");
 …
                 //activity_bar.setValue(activity_bar.getMaximum());
                 //activity_bar.setString(Gatherer.dictionary.get("MetaEdit.Ready"));
                 Collections.sort(current_metadata, MSMUtils.METADATA_COMPARATOR);
                 fireTableDataChanged();
+        Collections.sort(current_metadata, MSMUtils.METADATA_COMPARATOR);
+        fireTableDataChanged();
                 // Finally complete
                 complete = true;
+        complete = true;
                 // If in the in between we've been asked to select a certain metadata, we action that now.
                 if(selected_metadata != null) {
                      setSelectedMetadata(selected_metadata);
+                }
+          }
           /** For some reason contains doesn't always work. It appear not to use equals() properly, as ElementWrappers need to compare themselves by their string content as other data members are nearly always different even between to ElementWrappers generated from the same DOM Element. */
           private boolean contains(Vector elements, ElementWrapper element) {
                 if(element != null) {
                      for(int i = 0; i < elements.size(); i++) {
                           if(element.equals(elements.get(i))) {
                                 return true;
+                          }
+                     }
+                }
                 return false;
+          }
           private void showInheritedMetadataWarning() {
                 if(!had_warning) {
                      had_warning = true;
                      Runnable task = new Runnable() {
                                 public void run() {
                                      WarningDialog dialog = new WarningDialog("warning.InheritedMetadata", false);
                                      dialog.display();
                                      dialog.dispose();
                                      dialog = null;
+                                }
                           };
                      SwingUtilities.invokeLater(task);
+                }
+          }
+     }
+        if(selected_metadata != null) {
+        setSelectedMetadata(selected_metadata);
+        }
+    }
+    /** For some reason contains doesn't always work. It appear not to use equals() properly, as ElementWrappers need to compare themselves by their string content as other data members are nearly always different even between to ElementWrappers generated from the same DOM Element. */
+    private boolean contains(Vector elements, ElementWrapper element) {
+        if(element != null) {
+        for(int i = 0; i < elements.size(); i++) {
+            if(element.equals(elements.get(i))) {
+            return true;
+            }
+        }
+        }
+        return false;
+    }
+    private void showInheritedMetadataWarning() {
+        if(!had_warning) {
+        had_warning = true;
+        Runnable task = new Runnable() {
+            public void run() {
+                WarningDialog dialog = new WarningDialog("warning.InheritedMetadata", false);
+                dialog.display();
+                dialog.dispose();
+                dialog = null;
+            }
+            };
+        SwingUtilities.invokeLater(task);
+        }
+    }
+    }
+}

trunk/gli/src/org/greenstone/gatherer/gui/table/TableCellRenderer.java

-              r4293
+              r4366
 public class TableCellRenderer
      extends DefaultTableCellRenderer {
+    extends DefaultTableCellRenderer {
      private GTableModel model = null;
+    private GTableModel model = null;
      public TableCellRenderer(GTableModel model) {
           super();
           this.model = model;
+     }
+    public TableCellRenderer(GTableModel model) {
+    super();
+    this.model = model;
+    }
      /** Returns the default table cell renderer.
       * @param table The <strong>JTable</strong>.
       * @param value The value to assign to the cell at [row, column] as an <strong>Object</strong>.
       * @param isSelected <i>true</i> if cell is selected.
       * @param row The row of the cell to render as an <i>int</i>.
       * @param column The column of the cell to render as an <i>int</i>.
       * @param hasFocus <i>true</i> if cell has focus, render cell appropriately. For example, put a special border on the cell, if the cell can be edited, render in the color used to indicate editing.
       * @return The default table cell renderer <strong>Component</strong>.
       */
      public Component getTableCellRendererComponent(JTable table, Object value, boolean isSelected, boolean hasFocus, int row, int column) {
           JLabel renderer = null;
           if(value instanceof File) {
                 if(value != null) {
                      if(isSelected && hasFocus) {
                           Metadata data = model.getMetadataAtRow(row);
                           Gatherer.g_man.metaedit_pane.setSelection((File)value);
                           Gatherer.g_man.metaedit_pane.setSelectedMetadata(data);
+                     }
                      renderer = new JLabel(Utility.getImage("upfolder.gif"));
+                }
+          }
           if(renderer == null) {
                 renderer = (JLabel) super.getTableCellRendererComponent(table, value, isSelected, hasFocus, row, column);
+          }
           // Set up the component
           renderer.setOpaque(true);
           // Foreground
           if(model.isCommon(row)) {
                 renderer.setForeground(Color.black);
+          }
           else {
                 renderer.setForeground(Color.gray);
+          }
           // Background
           if(column <= 1) {
                 if(isSelected) {
                      renderer.setBackground(Gatherer.config.getColor("coloring.workspace_heading_background", true));
+                }
                 else {
                      renderer.setBackground(Gatherer.config.getColor("coloring.collection_heading_background", true));
+                }
+          }
           else {
                 if(isSelected) {
                      renderer.setBackground(Gatherer.config.getColor("coloring.workspace_heading_background", true));
+                }
                 else {
                      renderer.setBackground(Gatherer.config.getColor("coloring.collection_tree_background", true));
+                }
+          }
           // Finally the 3rd column of cells never paint focus.
           if(column == 2) {
                 renderer.setBorder(BorderFactory.createEmptyBorder(0,0,0,0));
+          }
           return renderer;
+     }
+    /** Returns the default table cell renderer.
+     * @param table The <strong>JTable</strong>.
+     * @param value The value to assign to the cell at [row, column] as an <strong>Object</strong>.
+     * @param isSelected <i>true</i> if cell is selected.
+     * @param row The row of the cell to render as an <i>int</i>.
+     * @param column The column of the cell to render as an <i>int</i>.
+     * @param hasFocus <i>true</i> if cell has focus, render cell appropriately. For example, put a special border on the cell, if the cell can be edited, render in the color used to indicate editing.
+     * @return The default table cell renderer <strong>Component</strong>.
+     */
+    public Component getTableCellRendererComponent(JTable table, Object value, boolean isSelected, boolean hasFocus, int row, int column) {
+    JLabel renderer = null;
+    if(value instanceof File) {
+        if(value != null) {
+        if(isSelected && hasFocus) {
+            Metadata data = model.getMetadataAtRow(row);
+            Gatherer.g_man.metaedit_pane.setSelection((File)value);
+            Gatherer.g_man.metaedit_pane.setSelectedMetadata(data);
+        }
+        renderer = new JLabel(Utility.getImage("upfolder.gif"));
+        }
+    }
+    if(renderer == null) {
+        renderer = (JLabel) super.getTableCellRendererComponent(table, value, isSelected, hasFocus, row, column);
+    }
+    // Set up the component
+    renderer.setOpaque(true);
+    // Foreground
+    if(model.isCommon(row)) {
+        renderer.setForeground(Color.black);
+    }
+    else {
+        renderer.setForeground(Color.gray);
+    }
+    // Background
+    if(column <= 1) {
+        if(isSelected) {
+        renderer.setBackground(Gatherer.config.getColor("coloring.workspace_heading_background", true));
+        }
+        else {
+        renderer.setBackground(Gatherer.config.getColor("coloring.collection_heading_background", true));
+        }
+    }
+    else {
+        if(isSelected) {
+        renderer.setBackground(Gatherer.config.getColor("coloring.workspace_heading_background", true));
+        }
+        else {
+        renderer.setBackground(Gatherer.config.getColor("coloring.collection_tree_background", true));
+        }
+    }
+    // Finally the 3rd column of cells never paint focus.
+    if(column == 2) {
+        renderer.setBorder(BorderFactory.createEmptyBorder(0,0,0,0));
+    }
+    return renderer;
+    }
+}

trunk/gli/src/org/greenstone/gatherer/gui/tree/DragTree.java

-              r4313
+              r4366
 public class DragTree
      extends JTree
      implements Autoscroll, DragGestureListener, DragSourceListener, DropTargetListener, DragComponent, TreeSelectionListener {
      /** The normal background color. */
      private Color background_color;
      /** The normal foreground color. */
      private Color foreground_color;
      /** The Group this component belongs to. */
      private DragGroup group;
      /** The image to use for the disabled background. */
      private ImageIcon disabled_background;
      /** The image to use for a normal background. */
      private ImageIcon normal_background;
      /** The icon to use for multiple node drag'n'drops. We decided against using the windows paradigm or a block of x horizontal lines for x files. */
      private ImageIcon multiple_icon = new ImageIcon("resource"+File.separator+"multiple.gif");
      /** The default drag action, although its not that important as we provide custom icons during drags. */
      private int drag_action = DnDConstants.ACTION_MOVE;
      /** The location of the last ghost drawn, so that we can repair the 'spoilt' area. */
      private Point pt_last = null;
      /** The region borderer by the lower cue line. */
      private Rectangle lower_cue_line;
      /** The region covered by the drag ghost icon. */
      private Rectangle ra_ghost = new Rectangle();
      /** The region borderer by the upper cue line. */
      private Rectangle upper_cue_line;
      /** The identifying name of this Tree. */
      private String name;
      /** The last tree path the drag was hovered over. */
      private TreePath previous_path = null;
      static private final Color TRANSPARENT_COLOR = new Color(0,0,0,0);
      /** The distance from the edge of the current view within the scroll bar which if entered causes the view to scroll. */
      static private final int AUTOSCROLL_MARGIN = 12;
      public DragTree(String name, String background_name) {
           super();
           init(name, background_name);
+     }
      public DragTree(String name, TreeModel model, String background_name) {
           super(model);
           init(name, background_name);
           // Connection
           setModel(model);
+     }
      public void init(String name, String background_name) {
           // Init
           this.name = name;
           if(background_name != null) {
                 this.disabled_background = new ImageIcon("background.gif");
                 this.normal_background = new ImageIcon(background_name);
+          }
           // Creation
           this.putClientProperty("JTree.lineStyle", "Angled");
           this.setAutoscrolls(true);
           this.setEditable(false);
           this.setLargeModel(true);
           this.setOpaque(true);
           this.setSelectionModel(new DragTreeSelectionModel(this));
           // Connection
           addTreeSelectionListener(this);
           DragTreeCellRenderer renderer = new DragTreeCellRenderer();
           //make the renderer paint nodes as transparent when not selected
           //renderer.setBackgroundNonSelectionColor(new Color(0,0,0,0));
           setCellRenderer(renderer);
+    extends JTree
+    implements Autoscroll, DragGestureListener, DragSourceListener, DropTargetListener, DragComponent, TreeSelectionListener {
+    /** The normal background color. */
+    private Color background_color;
+    /** The normal foreground color. */
+    private Color foreground_color;
+    /** The Group this component belongs to. */
+    private DragGroup group;
+    /** The image to use for the disabled background. */
+    private ImageIcon disabled_background;
+    /** The image to use for a normal background. */
+    private ImageIcon normal_background;
+    /** The icon to use for multiple node drag'n'drops. We decided against using the windows paradigm or a block of x horizontal lines for x files. */
+    private ImageIcon multiple_icon = new ImageIcon("resource"+File.separator+"multiple.gif");
+    /** The default drag action, although its not that important as we provide custom icons during drags. */
+    private int drag_action = DnDConstants.ACTION_MOVE;
+    /** The location of the last ghost drawn, so that we can repair the 'spoilt' area. */
+    private Point pt_last = null;
+    /** The region borderer by the lower cue line. */
+    private Rectangle lower_cue_line;
+    /** The region covered by the drag ghost icon. */
+    private Rectangle ra_ghost = new Rectangle();
+    /** The region borderer by the upper cue line. */
+    private Rectangle upper_cue_line;
+    /** The identifying name of this Tree. */
+    private String name;
+    /** The last tree path the drag was hovered over. */
+    private TreePath previous_path = null;
+    static private final Color TRANSPARENT_COLOR = new Color(0,0,0,0);
+    /** The distance from the edge of the current view within the scroll bar which if entered causes the view to scroll. */
+    static private final int AUTOSCROLL_MARGIN = 12;
+    public DragTree(String name, String background_name) {
+    super();
+    init(name, background_name);
+    }
+    public DragTree(String name, TreeModel model, String background_name) {
+    super(model);
+    init(name, background_name);
+    // Connection
+    setModel(model);
+    }
+    public void init(String name, String background_name) {
+    // Init
+    this.name = name;
+    if(background_name != null) {
+        this.disabled_background = new ImageIcon("background.gif");
+        this.normal_background = new ImageIcon(background_name);
+    }
+    // Creation
+    this.putClientProperty("JTree.lineStyle", "Angled");
+    this.setAutoscrolls(true);
+    this.setEditable(false);
+    this.setLargeModel(true);
+    this.setOpaque(true);
+    this.setSelectionModel(new DragTreeSelectionModel(this));
+    // Connection
+    addTreeSelectionListener(this);
+    DragTreeCellRenderer renderer = new DragTreeCellRenderer();
+    //make the renderer paint nodes as transparent when not selected
+    //renderer.setBackgroundNonSelectionColor(new Color(0,0,0,0));
+    setCellRenderer(renderer);
           // Drag'n'drop Setup
           // Drag source setup.
           DragSource.getDefaultDragSource().createDefaultDragGestureRecognizer(this, drag_action, this);
           // Drop destination setup.
           new DropTarget(this, drag_action, this, true);
+     }
      // Autoscroll Interface - Scroll because the mouse cursor is in our scroll zone.<br>
      // The following code was borrowed from the book:<br>
      //              Java Swing<br>
      //              By Robert Eckstein, Marc Loy & Dave Wood<br>
      //              Paperback - 1221 pages 1 Ed edition (September 1998)<br>
      //              O'Reilly & Associates; ISBN: 156592455X<br>
      // The relevant chapter of which can be found at:<br>
      //              http://www.oreilly.com/catalog/jswing/chapter/dnd.beta.pdf<br>
      // But I've probably tortured it beyond all recognition anyway.
      public void autoscroll(Point pt) {
           // Figure out which row we're on.
           int row = getRowForLocation(pt.x, pt.y);
           // If we are not on a row then ignore this autoscroll request
           if (row < 0) return;
           Rectangle bounds = getBounds();// Yes, scroll up one row
           // Now decide if the row is at the top of the screen or at the bottom. We do this to make the previous row (or the next row) visible as appropriate. If we're at the absolute top or bottom, just return the first or last row respectively.
           // Is row at top of screen?
           if(pt.y + bounds.y <= AUTOSCROLL_MARGIN) {
+    DragSource.getDefaultDragSource().createDefaultDragGestureRecognizer(this, drag_action, this);
+    // Drop destination setup.
+    new DropTarget(this, drag_action, this, true);
+    }
+    // Autoscroll Interface - Scroll because the mouse cursor is in our scroll zone.<br>
+    // The following code was borrowed from the book:<br>
+    //              Java Swing<br>
+    //              By Robert Eckstein, Marc Loy & Dave Wood<br>
+    //              Paperback - 1221 pages 1 Ed edition (September 1998)<br>
+    //              O'Reilly & Associates; ISBN: 156592455X<br>
+    // The relevant chapter of which can be found at:<br>
+    //              http://www.oreilly.com/catalog/jswing/chapter/dnd.beta.pdf<br>
+    // But I've probably tortured it beyond all recognition anyway.
+    public void autoscroll(Point pt) {
+    // Figure out which row we're on.
+    int row = getRowForLocation(pt.x, pt.y);
+    // If we are not on a row then ignore this autoscroll request
+    if (row < 0) return;
+    Rectangle bounds = getBounds();// Yes, scroll up one row
+    // Now decide if the row is at the top of the screen or at the bottom. We do this to make the previous row (or the next row) visible as appropriate. If we're at the absolute top or bottom, just return the first or last row respectively.
+    // Is row at top of screen?
+    if(pt.y + bounds.y <= AUTOSCROLL_MARGIN) {
                 // Yes, scroll up one row
                 if(row <= 0) {
                      row = 0;
+                }
                 else {
                      row = row - 1;
+                }
+          }
           else {
+        if(row <= 0) {
+        row = 0;
+        }
+        else {
+        row = row - 1;
+        }
+    }
+    else {
                 // No, scroll down one row
                 if(row < getRowCount() - 1) {
                      row = row + 1;
+                }
+          }
           this.scrollRowToVisible(row);
+     }
      /** In order for the appearance to be consistant, given we may be in the situation where the pointer has left our focus but the ghost remains, this method allows other members of the GGroup to tell this component to clear its ghost.
       */
      public void clearGhost() {
           // Erase the last ghost image and cue line
           paintImmediately(ra_ghost.getBounds());
+     }
      /** Any implementation of DragSourceListener must include this method so we can be notified when the drag event ends (somewhere else), which will in turn remove actions.
+        if(row < getRowCount() - 1) {
+        row = row + 1;
+        }
+    }
+    this.scrollRowToVisible(row);
+    }
+    /** In order for the appearance to be consistant, given we may be in the situation where the pointer has left our focus but the ghost remains, this method allows other members of the GGroup to tell this component to clear its ghost.
+      */
+    public void clearGhost() {
+    // Erase the last ghost image and cue line
+    paintImmediately(ra_ghost.getBounds());
+    }
+    /** Any implementation of DragSourceListener must include this method so we can be notified when the drag event ends (somewhere else), which will in turn remove actions.
       * @param event A <strong>DragSourceDropEvent</strong> containing all the information about the end of the drag event.
       */
      public void dragDropEnd(DragSourceDropEvent event) {
           if(event.getDropSuccess()) {
+    public void dragDropEnd(DragSourceDropEvent event) {
+    if(event.getDropSuccess()) {
                 // Do whatever I do when the drop is successful.
+          }
+     }
      /** Any implementation of DragSourceListener must include this method so we can be notified when the drag focus enters this component.
+    }
+    }
+    /** Any implementation of DragSourceListener must include this method so we can be notified when the drag focus enters this component.
       * @param event A <strong>DragSourceDragEvent</strong> containing all the information
       * about the drag event.
       */
      public void dragEnter(DragSourceDragEvent event) {
           // Handled elsewhere.
+     }
      /** Any implementation of DropTargetListener must include this method so we can be notified when the drag focus enters this component, which in this case is to grab focus from within our group.
+    public void dragEnter(DragSourceDragEvent event) {
+    // Handled elsewhere.
+    }
+    /** Any implementation of DropTargetListener must include this method so we can be notified when the drag focus enters this component, which in this case is to grab focus from within our group.
       * @param event A <strong>DropTargetDragEvent</strong> containing all the information about the drag event.
       */
      public void dragEnter(DropTargetDragEvent event) {
           group.grabFocus(this);
+     }
      /** Any implementation of DragSourceListener must include this method so we can be notified when the drag focus leaves this component.
+    public void dragEnter(DropTargetDragEvent event) {
+    group.grabFocus(this);
+    }
+    /** Any implementation of DragSourceListener must include this method so we can be notified when the drag focus leaves this component.
       * @param event A <strong>DragSourceEvent</strong> containing all the information about the drag event.
       */
      public void dragExit(DragSourceEvent event) {
           clearGhost();
+     }
      /** Any implementation of DropTargetListener must include this method
+    public void dragExit(DragSourceEvent event) {
+    clearGhost();
+    }
+    /** Any implementation of DropTargetListener must include this method
       * so we can be notified when the drag focus leaves this component.
       * @param event A DropTargetEvent containing all the information
       * about the drag event.
       */
      public void dragExit(DropTargetEvent event) {
           clearGhost();
+     }
      /** Any implementation of DragGestureListener must include this method
+    public void dragExit(DropTargetEvent event) {
+    clearGhost();
+    }
+    /** Any implementation of DragGestureListener must include this method
       * so we can be notified when a drag action has been noticed, thus a
       * drag action has begun.
 …
       * the drag event.
       */
      public void dragGestureRecognized(DragGestureEvent event) {
           // Disable editing, unless you want to have the edit box pop-up part way through dragging.
           this.setEditable(false);
           // We need this to find one of the selected nodes.
           Point origin = event.getDragOrigin();
           TreePath path = this.getPathForLocation(origin.x, origin.y);
           // Taking into account our delayed model of selection, it is possible the user has performed a select and drag in one click. Here we utilize the Windows paradigm like so: If the node at the origin of the drag and drop is already in our selection then we perform multiple drag and drop. Otherwise we recognise that this is a distinct drag-drop and move only the origin node.
           if(!isPathSelected(path)) {
                 ((DragTreeSelectionModel)selectionModel).setImmediate(true);
                 setSelectionPath(path);
+          }
           // Now update the selection stored as far as the group is concerned.
           group.setSelection(getSelectionPaths());
           group.setSource(this);
           // First grab ghost.
           group.grabFocus(this);
           // Ghost Image stuff.
           if(path != null) {
                 Rectangle rect = this.getPathBounds(path);
                 group.mouse_offset = new Point(origin.x - rect.x, origin.y - rect.y);
+    public void dragGestureRecognized(DragGestureEvent event) {
+    // Disable editing, unless you want to have the edit box pop-up part way through dragging.
+    this.setEditable(false);
+    // We need this to find one of the selected nodes.
+    Point origin = event.getDragOrigin();
+    TreePath path = this.getPathForLocation(origin.x, origin.y);
+    // Taking into account our delayed model of selection, it is possible the user has performed a select and drag in one click. Here we utilize the Windows paradigm like so: If the node at the origin of the drag and drop is already in our selection then we perform multiple drag and drop. Otherwise we recognise that this is a distinct drag-drop and move only the origin node.
+    if(!isPathSelected(path)) {
+        ((DragTreeSelectionModel)selectionModel).setImmediate(true);
+        setSelectionPath(path);
+    }
+    // Now update the selection stored as far as the group is concerned.
+    group.setSelection(getSelectionPaths());
+    group.setSource(this);
+    // First grab ghost.
+    group.grabFocus(this);
+    // Ghost Image stuff.
+    if(path != null) {
+        Rectangle rect = this.getPathBounds(path);
+        group.mouse_offset = new Point(origin.x - rect.x, origin.y - rect.y);
                 // Create the ghost image.
                 // Retrieve the selected files.
                 int selection_count = getSelectionCount();
                 if(selection_count > 0) {
                      JLabel label;
                      if(selection_count == 1) {
                           TreePath node_path = getSelectionPath();
                           FileNode node = (FileNode) path.getLastPathComponent();
                           label = new JLabel(node.toString(), ((DefaultTreeCellRenderer)getCellRenderer()).getLeafIcon(), JLabel.CENTER);
+                     }
                      else {
                           String title = getSelectionCount() + " files";
                           label = new JLabel(title, ((DefaultTreeCellRenderer)getCellRenderer()).getClosedIcon(), JLabel.CENTER);
                           title = null;
+                     }
                      // The layout manager normally does this.
                      Dimension label_size = label.getPreferredSize();
                      label.setSize(label_size);
                      label.setBackground(TRANSPARENT_COLOR);
                      label.setOpaque(true);
                      // Get a buffered image of the selection for dragging a ghost image.
                      group.image_ghost = new BufferedImage(label_size.width, label_size.height, BufferedImage.TYPE_INT_ARGB_PRE);
                      label_size = null;
                      // Get a graphics context for this image.
                      Graphics2D g2 = group.image_ghost.createGraphics();
                      // Make the image ghostlike
                      g2.setComposite(AlphaComposite.getInstance (AlphaComposite.SRC, 0.5f));
                      // Ask the cell renderer to paint itself into the BufferedImage
                      label.paint(g2);
                      g2 = null;
                      label = null;
                      try {
                           event.startDrag(new Cursor(Cursor.DEFAULT_CURSOR), group.image_ghost, new Point(5,5), new StringSelection("dummy"), this);
                           //dragging = true;
+                     }
                      catch(Exception error) {
                           error.printStackTrace();
+                     }
+                }
+          }
+     }
      /** Implementation side-effect.
+        int selection_count = getSelectionCount();
+        if(selection_count > 0) {
+        JLabel label;
+        if(selection_count == 1) {
+            TreePath node_path = getSelectionPath();
+            FileNode node = (FileNode) path.getLastPathComponent();
+            label = new JLabel(node.toString(), ((DefaultTreeCellRenderer)getCellRenderer()).getLeafIcon(), JLabel.CENTER);
+        }
+        else {
+            String title = getSelectionCount() + " files";
+            label = new JLabel(title, ((DefaultTreeCellRenderer)getCellRenderer()).getClosedIcon(), JLabel.CENTER);
+            title = null;
+        }
+        // The layout manager normally does this.
+        Dimension label_size = label.getPreferredSize();
+        label.setSize(label_size);
+        label.setBackground(TRANSPARENT_COLOR);
+        label.setOpaque(true);
+        // Get a buffered image of the selection for dragging a ghost image.
+        group.image_ghost = new BufferedImage(label_size.width, label_size.height, BufferedImage.TYPE_INT_ARGB_PRE);
+        label_size = null;
+        // Get a graphics context for this image.
+        Graphics2D g2 = group.image_ghost.createGraphics();
+        // Make the image ghostlike
+        g2.setComposite(AlphaComposite.getInstance (AlphaComposite.SRC, 0.5f));
+        // Ask the cell renderer to paint itself into the BufferedImage
+        label.paint(g2);
+        g2 = null;
+        label = null;
+        try {
+            event.startDrag(new Cursor(Cursor.DEFAULT_CURSOR), group.image_ghost, new Point(5,5), new StringSelection("dummy"), this);
+            //dragging = true;
+        }
+        catch(Exception error) {
+            error.printStackTrace();
+        }
+        }
+    }
+    }
+    /** Implementation side-effect.
       * @param event A DragSourceDragEvent containing all the information about the drag event.
       */
      public void dragOver(DragSourceDragEvent event) {
+     }
      /** Any implementation of DropTargetListener must include this method
+    public void dragOver(DragSourceDragEvent event) {
+    }
+    /** Any implementation of DropTargetListener must include this method
       * so we can be notified when the drag moves in this component.
       * @param event A DropTargetDragEvent containing all the information
       * about the drag event.
       */
      public void dragOver(DropTargetDragEvent event) {
           // Draw the mouse ghost
           Graphics2D g2 = (Graphics2D) getGraphics();
           Point pt = event.getLocation();
           if(pt_last != null && pt.equals(pt_last)) {
                 return;
+          }
           pt_last = pt;
           if(!DragSource.isDragImageSupported()) {
+    public void dragOver(DropTargetDragEvent event) {
+    // Draw the mouse ghost
+    Graphics2D g2 = (Graphics2D) getGraphics();
+    Point pt = event.getLocation();
+    if(pt_last != null && pt.equals(pt_last)) {
+        return;
+    }
+    pt_last = pt;
+    if(!DragSource.isDragImageSupported()) {
                 // Erase the last ghost image and cue line
                 paintImmediately(ra_ghost.getBounds());
+        paintImmediately(ra_ghost.getBounds());
                 // Remember where you are about to draw the new ghost image
                 ra_ghost.setRect(pt.x - group.mouse_offset.x, pt.y - group.mouse_offset.y, group.image_ghost.getWidth(), group.image_ghost.getHeight());
+        ra_ghost.setRect(pt.x - group.mouse_offset.x, pt.y - group.mouse_offset.y, group.image_ghost.getWidth(), group.image_ghost.getHeight());
                 // Draw the ghost image
                 g2.drawImage(group.image_ghost, AffineTransform.getTranslateInstance(ra_ghost.getX(), ra_ghost.getY()), null);
+          }
           // Now we highlight the target node if it is a valid drop target. Of course we don't bother if we are still over a node which has already been identified as to whether its a drop target.
           TreePath target_path = this.getPathForLocation(pt.x, pt.y);
           if(previous_path == null || target_path != null && !target_path.equals(previous_path)) {
+        g2.drawImage(group.image_ghost, AffineTransform.getTranslateInstance(ra_ghost.getX(), ra_ghost.getY()), null);
+    }
+    // Now we highlight the target node if it is a valid drop target. Of course we don't bother if we are still over a node which has already been identified as to whether its a drop target.
+    TreePath target_path = this.getPathForLocation(pt.x, pt.y);
+    if(previous_path == null || target_path != null && !target_path.equals(previous_path)) {
                 // Immediately clear the old cue lines.
                 if(upper_cue_line != null && lower_cue_line != null) {
                      paintImmediately(upper_cue_line.getBounds());
                      paintImmediately(lower_cue_line.getBounds());
+                }
                 if(isValidDrop(target_path)) {
                      ///ystem.err.println("Valid. Painting cues.");
                      // Get the drop target's bounding rectangle
                      Rectangle raPath = getPathBounds(target_path);
                      // Cue line bounds (2 pixels beneath the drop target)
                      upper_cue_line = new Rectangle(0,  raPath.y + (int)raPath.getHeight(), getWidth(), 2);
                      lower_cue_line = new Rectangle(0,  raPath.y, getWidth(), 2);
                      g2.setColor(((DefaultTreeCellRenderer)cellRenderer).getBackgroundSelectionColor()); // The cue line color
                      g2.fill(upper_cue_line);         // Draw the cue line
                      g2.fill(lower_cue_line);
+                }
                 else {
                      upper_cue_line = null;
                      lower_cue_line = null;
+                }
+          }
+     }
      /** Any implementation of DropTargetListener must include this method
+        if(upper_cue_line != null && lower_cue_line != null) {
+        paintImmediately(upper_cue_line.getBounds());
+        paintImmediately(lower_cue_line.getBounds());
+        }
+        if(isValidDrop(target_path)) {
+        ///ystem.err.println("Valid. Painting cues.");
+        // Get the drop target's bounding rectangle
+        Rectangle raPath = getPathBounds(target_path);
+        // Cue line bounds (2 pixels beneath the drop target)
+        upper_cue_line = new Rectangle(0,  raPath.y + (int)raPath.getHeight(), getWidth(), 2);
+        lower_cue_line = new Rectangle(0,  raPath.y, getWidth(), 2);
+        g2.setColor(((DefaultTreeCellRenderer)cellRenderer).getBackgroundSelectionColor()); // The cue line color
+        g2.fill(upper_cue_line);         // Draw the cue line
+        g2.fill(lower_cue_line);
+        }
+        else {
+        upper_cue_line = null;
+        lower_cue_line = null;
+        }
+    }
+    }
+    /** Any implementation of DropTargetListener must include this method
       * so we can be notified when the drag ends, ie the transferable is
       * dropped.
 …
       * about the end of the drag event.
       */
      public void drop(DropTargetDropEvent event) {
           ///start = System.currentTimeMillis();
           ///ystem.err.println("Drop target drop: " + this);
           event.acceptDrop(drag_action);
           if(!name.equals(Utility.WORKSPACE_TREE)) {
+    public void drop(DropTargetDropEvent event) {
+    ///start = System.currentTimeMillis();
+    ///ystem.err.println("Drop target drop: " + this);
+    event.acceptDrop(drag_action);
+    if(!name.equals(Utility.WORKSPACE_TREE)) {
                 // Determine what node we dropped over.
                 Point pt = event.getLocation();
                 TreePath target_path = this.getPathForLocation(pt.x, pt.y);
                 FileNode target = null;
                 if(target_path != null) {
                      if(isValidDrop(target_path)) {
                           target = (FileNode) target_path.getLastPathComponent();
+                     }
                      else {
                           // Warn that this is an invalid drop.
                           JOptionPane.showMessageDialog(Gatherer.g_man, Gatherer.dictionary.get("FileActions.InvalidTarget"), Gatherer.dictionary.get("General.Error"), JOptionPane.ERROR_MESSAGE);
+                     }
+                }
                 else {
                      target = (FileNode) getModel().getRoot();
+                }
                 target_path = null;
                 pt = null;
                 if(target != null) {
                      ///ystem.err.println("Valid drop.");
                      TreePath[] selection = group.getSelection();
                      if(target != null) {
                           FileNode[] source_nodes = new FileNode[selection.length];
                           for(int i = 0; i < source_nodes.length; i++) {
                                 source_nodes[i] = (FileNode) selection[i].getLastPathComponent();
+                          }
                           Gatherer.f_man.action(group.getSource(), source_nodes, this, target);
                           source_nodes = null;
+                     }
                      group.setSelection(null);
                      group.setSource(null);
                      selection = null;
                      target = null;
+                }
+          }
           else {
+        Point pt = event.getLocation();
+        TreePath target_path = this.getPathForLocation(pt.x, pt.y);
+        FileNode target = null;
+        if(target_path != null) {
+        if(isValidDrop(target_path)) {
+            target = (FileNode) target_path.getLastPathComponent();
+        }
+        else {
+            // Warn that this is an invalid drop.
+            JOptionPane.showMessageDialog(Gatherer.g_man, Gatherer.dictionary.get("FileActions.InvalidTarget"), Gatherer.dictionary.get("General.Error"), JOptionPane.ERROR_MESSAGE);
+        }
+        }
+        else {
+        target = (FileNode) getModel().getRoot();
+        }
+        target_path = null;
+        pt = null;
+        if(target != null) {
+        ///ystem.err.println("Valid drop.");
+        TreePath[] selection = group.getSelection();
+        if(target != null) {
+            FileNode[] source_nodes = new FileNode[selection.length];
+            for(int i = 0; i < source_nodes.length; i++) {
+            source_nodes[i] = (FileNode) selection[i].getLastPathComponent();
+            }
+            Gatherer.f_man.action(group.getSource(), source_nodes, this, target);
+            source_nodes = null;
+        }
+        group.setSelection(null);
+        group.setSource(null);
+        selection = null;
+        target = null;
+        }
+    }
+    else {
                 // Warn that this is an invalid drop.
                 JOptionPane.showMessageDialog(Gatherer.g_man, Gatherer.dictionary.get("FileActions.ReadOnlyTarget"), Gatherer.dictionary.get("General.Error"), JOptionPane.ERROR_MESSAGE);
+          }
           // Clear up the group.image_ghost
           paintImmediately(ra_ghost.getBounds());
           event.getDropTargetContext().dropComplete(true);
+     }
      /** Any implementation of DragSourceListener must include this method
+        JOptionPane.showMessageDialog(Gatherer.g_man, Gatherer.dictionary.get("FileActions.ReadOnlyTarget"), Gatherer.dictionary.get("General.Error"), JOptionPane.ERROR_MESSAGE);
+    }
+    // Clear up the group.image_ghost
+    paintImmediately(ra_ghost.getBounds());
+    event.getDropTargetContext().dropComplete(true);
+    }
+    /** Any implementation of DragSourceListener must include this method
       * so we can be notified when the action to be taken upon drop changes.
       * @param event A DragSourceDragEvent containing all the information
       * about the drag event.
       */
      public void dropActionChanged(DragSourceDragEvent event) {
+     }
      /** Any implementation of DropTargetListener must include this method
+    public void dropActionChanged(DragSourceDragEvent event) {
+    }
+    /** Any implementation of DropTargetListener must include this method
       * so we can be notified when the action to be taken upon drop changes.
       * @param event A DropTargetDragEvent containing all the information
       * about the drag event.
       */
      public void dropActionChanged(DropTargetDragEvent event) {
+     }
      /** Used to notify this component that it has gained focus. It should
+    public void dropActionChanged(DropTargetDragEvent event) {
+    }
+    /** Used to notify this component that it has gained focus. It should
       * make some effort to inform the user of this.
       */
      public void gainFocus() {
           ///ystem.err.println("Gained focus: " + this);
           ((DragTreeCellRenderer)cellRenderer).gainFocus();
           repaint();
+     }
      /** Autoscroll Interface...
+    public void gainFocus() {
+    ///ystem.err.println("Gained focus: " + this);
+    ((DragTreeCellRenderer)cellRenderer).gainFocus();
+    repaint();
+    }
+    /** Autoscroll Interface...
       * The following code was borrowed from the book:
       *              Java Swing
 …
       * the tree is in. This makes it a bit messy.
       */
      public Insets getAutoscrollInsets()
+     {
           Rectangle raOuter = this.getBounds();
           Rectangle raInner = this.getParent().getBounds();
           return new Insets(raInner.y - raOuter.y + AUTOSCROLL_MARGIN,
                                   raInner.x - raOuter.x + AUTOSCROLL_MARGIN,
                                   raOuter.height - raInner.height - raInner.y + raOuter.y + AUTOSCROLL_MARGIN,
                                   raOuter.width - raInner.width - raInner.x + raOuter.x + AUTOSCROLL_MARGIN);
+     }
      public String getSelectionDetails() {
           return ((DragTreeSelectionModel)selectionModel).getDetails();
+     }
      public FileSystemModel getTreeModel() {
           return (FileSystemModel) getModel();
+     }
      /** This method is used to inform this component when it loses focus,
+    public Insets getAutoscrollInsets()
+    {
+    Rectangle raOuter = this.getBounds();
+    Rectangle raInner = this.getParent().getBounds();
+    return new Insets(raInner.y - raOuter.y + AUTOSCROLL_MARGIN,
+              raInner.x - raOuter.x + AUTOSCROLL_MARGIN,
+              raOuter.height - raInner.height - raInner.y + raOuter.y + AUTOSCROLL_MARGIN,
+              raOuter.width - raInner.width - raInner.x + raOuter.x + AUTOSCROLL_MARGIN);
+    }
+    public String getSelectionDetails() {
+    return ((DragTreeSelectionModel)selectionModel).getDetails();
+    }
+    public FileSystemModel getTreeModel() {
+    return (FileSystemModel) getModel();
+    }
+    /** This method is used to inform this component when it loses focus,
       * and should indicate this somehow.
       */
      public void loseFocus() {
           ///ystem.err.println("Lost focus: " + this);
           ((DragTreeCellRenderer)cellRenderer).loseFocus();
           repaint();
+     }
      public void mapDirectory(File file, String title) {
           try {
                 ((FileSystemModel)treeModel).mapDirectory(file, title);
+          }
           catch (Exception error) {
                 error.printStackTrace();
+          }
+     }
      public void paint(Graphics g) {
           if(disabled_background != null) {
                 int height = getSize().height;
                 int offset = 0;
                 ImageIcon background;
                 if(isEnabled()) {
                      background = normal_background;
+                }
                 else {
                      background = disabled_background;
+                }
                 while((height - offset) > 0) {
                      g.drawImage(background.getImage(), 0, offset, null);
                      offset = offset + background.getIconHeight();
+                }
                 background = null;
+          }
           super.paint(g);
+     }
      public void refresh(TreePath path) {
           ((FileSystemModel)treeModel).refresh(path);
+     }
      public void setBackgroundNonSelectionColor(Color color) {
           background_color = color;
           if(isEnabled()) {
                 setBackground(color);
                 ((DefaultTreeCellRenderer)cellRenderer).setBackgroundNonSelectionColor(color);
+          }
           else {
                 setBackground(Color.lightGray);
                 ((DefaultTreeCellRenderer)cellRenderer).setBackgroundNonSelectionColor(Color.lightGray);
+          }
           repaint();
+     }
      public void setBackgroundSelectionColor(Color color) {
           ((DefaultTreeCellRenderer)cellRenderer).setBackgroundSelectionColor(color);
             repaint();
+     }
      /** Override the normal setEnabled so the Tree exhibits a little more
+    public void loseFocus() {
+    ///ystem.err.println("Lost focus: " + this);
+    ((DragTreeCellRenderer)cellRenderer).loseFocus();
+    repaint();
+    }
+    public void mapDirectory(File file, String title) {
+    try {
+        ((FileSystemModel)treeModel).mapDirectory(file, title);
+    }
+    catch (Exception error) {
+        error.printStackTrace();
+    }
+    }
+    public void paint(Graphics g) {
+    if(disabled_background != null) {
+        int height = getSize().height;
+        int offset = 0;
+        ImageIcon background;
+        if(isEnabled()) {
+        background = normal_background;
+        }
+        else {
+        background = disabled_background;
+        }
+        while((height - offset) > 0) {
+        g.drawImage(background.getImage(), 0, offset, null);
+        offset = offset + background.getIconHeight();
+        }
+        background = null;
+    }
+    super.paint(g);
+    }
+    public void refresh(TreePath path) {
+    ((FileSystemModel)treeModel).refresh(path);
+    }
+    public void setBackgroundNonSelectionColor(Color color) {
+    background_color = color;
+    if(isEnabled()) {
+        setBackground(color);
+        ((DefaultTreeCellRenderer)cellRenderer).setBackgroundNonSelectionColor(color);
+    }
+    else {
+        setBackground(Color.lightGray);
+        ((DefaultTreeCellRenderer)cellRenderer).setBackgroundNonSelectionColor(Color.lightGray);
+    }
+    repaint();
+    }
+    public void setBackgroundSelectionColor(Color color) {
+    ((DefaultTreeCellRenderer)cellRenderer).setBackgroundSelectionColor(color);
+    repaint();
+    }
+    /** Override the normal setEnabled so the Tree exhibits a little more
       * change, which in this instance is the background colour changing.
       * @param state Whether this GTree should be in an enabled state.
       */
      public void setEnabled(boolean state) {
           super.setEnabled(state);
           clearSelection();
           // Change some colors
           if(state) {
                 setBackground(background_color);
                 ((DefaultTreeCellRenderer)cellRenderer).setBackgroundNonSelectionColor(background_color);
                 ((DefaultTreeCellRenderer)cellRenderer).setTextNonSelectionColor(foreground_color);
+          }
           else {
                 setBackground(Color.lightGray);
                 ((DefaultTreeCellRenderer)cellRenderer).setBackgroundNonSelectionColor(Color.lightGray);
                 ((DefaultTreeCellRenderer)cellRenderer).setTextNonSelectionColor(Color.black);
+          }
           repaint();
+     }
      public void setGroup(DragGroup group) {
           this.group = group;
+     }
      /** Determines whether the following selection attempts should go through the normal delayed selection model, or should happen immediately.*/
      public void setImmediate(boolean state) {
           ((DragTreeSelectionModel)selectionModel).setImmediate(state);
+     }
      public void setModel(TreeModel model) {
           super.setModel(model);
           if(model instanceof FileSystemModel) {
                 FileSystemModel file_system_model = (FileSystemModel) model;
                 file_system_model.setTree(this);
                 addTreeExpansionListener(file_system_model);
                 addTreeWillExpandListener(file_system_model);
                 file_system_model = null;
+          }
+     }
      /** Ensure that that file node denoted by the given file is selected. */
      public void setSelection(File file) {
           // We know the file exists, and thus that it must exists somewhere in our tree hierarchy.
           // 1. Retrieve the root node of our tree.
           FileNode current = (FileNode) getModel().getRoot();
           // 2. Find that node in the file parents, keeping track of each intermediate file.
           ArrayList files = new ArrayList();
           while(file != null && !current.toString().equals(file.getName())) {
                 files.add(0, file);
                 file = file.getParentFile();
+          }
           if(file == null) {
                 return;
+          }
           // 3. While there are still remaining intermediate files.
           while(files.size() > 0) {
                 file = (File) files.remove(0);
+    public void setEnabled(boolean state) {
+    super.setEnabled(state);
+    clearSelection();
+    // Change some colors
+    if(state) {
+        setBackground(background_color);
+        ((DefaultTreeCellRenderer)cellRenderer).setBackgroundNonSelectionColor(background_color);
+        ((DefaultTreeCellRenderer)cellRenderer).setTextNonSelectionColor(foreground_color);
+    }
+    else {
+        setBackground(Color.lightGray);
+        ((DefaultTreeCellRenderer)cellRenderer).setBackgroundNonSelectionColor(Color.lightGray);
+        ((DefaultTreeCellRenderer)cellRenderer).setTextNonSelectionColor(Color.black);
+    }
+    repaint();
+    }
+    public void setGroup(DragGroup group) {
+    this.group = group;
+    }
+    /** Determines whether the following selection attempts should go through the normal delayed selection model, or should happen immediately.*/
+    public void setImmediate(boolean state) {
+    ((DragTreeSelectionModel)selectionModel).setImmediate(state);
+    }
+    public void setModel(TreeModel model) {
+    super.setModel(model);
+    if(model instanceof FileSystemModel) {
+        FileSystemModel file_system_model = (FileSystemModel) model;
+        file_system_model.setTree(this);
+        addTreeExpansionListener(file_system_model);
+        addTreeWillExpandListener(file_system_model);
+        file_system_model = null;
+    }
+    }
+    /** Ensure that that file node denoted by the given file is selected. */
+    public void setSelection(File file) {
+    // We know the file exists, and thus that it must exists somewhere in our tree hierarchy.
+    // 1. Retrieve the root node of our tree.
+    FileNode current = (FileNode) getModel().getRoot();
+    // 2. Find that node in the file parents, keeping track of each intermediate file.
+    ArrayList files = new ArrayList();
+    while(file != null && !current.toString().equals(file.getName())) {
+        files.add(0, file);
+        file = file.getParentFile();
+    }
+    if(file == null) {
+        return;
+    }
+    // 3. While there are still remaining intermediate files.
+    while(files.size() > 0) {
+        file = (File) files.remove(0);
                 // 3a. Find the next file in the current nodes children.
                 boolean found = false;
                 current.map();
                 for(int i = 0; !found && i < current.getChildCount(); i++) {
                      FileNode child = (FileNode) current.getChildAt(i);
                      if(child.toString().equals(file.getName())) {
                           // 3b. Make the current node this node (if found) and continue.
                           found = true;
                           current = child;
+                     }
+                }
+        boolean found = false;
+        current.map();
+        for(int i = 0; !found && i < current.getChildCount(); i++) {
+        FileNode child = (FileNode) current.getChildAt(i);
+        if(child.toString().equals(file.getName())) {
+            // 3b. Make the current node this node (if found) and continue.
+            found = true;
+            current = child;
+        }
+        }
                 // 3c. If not found then return as this node can't exists somehow.
                 if(!found) {
                      return;
+                }
+          }
           // 4. We should now have the desired node. Remember to make the selection immediate.
           TreePath path = new TreePath(current.getPath());
           setImmediate(true);
           setSelectionPath(path);
           setImmediate(false);
+     }
      public void setTextNonSelectionColor(Color color) {
           foreground_color = color;
           if(isEnabled()) {
                 ((DefaultTreeCellRenderer)cellRenderer).setTextNonSelectionColor(color);
+          }
           else {
                 ((DefaultTreeCellRenderer)cellRenderer).setTextNonSelectionColor(Color.black);
+          }
           repaint();
+     }
      public void setTextSelectionColor(Color color) {
           ((DefaultTreeCellRenderer)cellRenderer).setTextSelectionColor(color);
             repaint();
+     }
      public String toString() {
           return name;
+     }
      public void valueChanged(TreeSelectionEvent e) {
           if(group == null) {
+        if(!found) {
+        return;
+        }
+    }
+    // 4. We should now have the desired node. Remember to make the selection immediate.
+    TreePath path = new TreePath(current.getPath());
+    setImmediate(true);
+    setSelectionPath(path);
+    setImmediate(false);
+    }
+    public void setTextNonSelectionColor(Color color) {
+    foreground_color = color;
+    if(isEnabled()) {
+        ((DefaultTreeCellRenderer)cellRenderer).setTextNonSelectionColor(color);
+    }
+    else {
+        ((DefaultTreeCellRenderer)cellRenderer).setTextNonSelectionColor(Color.black);
+    }
+    repaint();
+    }
+    public void setTextSelectionColor(Color color) {
+    ((DefaultTreeCellRenderer)cellRenderer).setTextSelectionColor(color);
+    repaint();
+    }
+    public String toString() {
+    return name;
+    }
+    public void valueChanged(TreeSelectionEvent e) {
+    if(group == null) {
                 ///ystem.err.println("Oh my god, this tree has no group: " + this);
+          }
           else {
             group.grabFocus(this);
+          }
           Gatherer.g_man.menu_bar.setMetaAuditSuffix(getSelectionDetails());
+     }
      private boolean isValidDrop(TreePath target_path) {
           boolean valid = false;
           if(target_path != null) {
                 FileNode target_node = (FileNode) target_path.getLastPathComponent();
+    }
+    else {
+        group.grabFocus(this);
+    }
+    Gatherer.g_man.menu_bar.setMetaAuditSuffix(getSelectionDetails());
+    }
+    private boolean isValidDrop(TreePath target_path) {
+    boolean valid = false;
+    if(target_path != null) {
+        FileNode target_node = (FileNode) target_path.getLastPathComponent();
                 // We can only continue testing if the node is a folder.
                 if(!target_node.isLeaf()) {
                      // Now we check if the node is readonly.
                      if(!target_node.isReadOnly()) {
                           // Finally we check the target path against the paths in the selection to ensure we are not adding to our own ancestors!
                           TreePath[] selection = group.getSelection();
                           boolean failed = false;
                           for(int i = 0; !failed && selection != null && i < selection.length; i++) {
                                 failed = selection[i].isDescendant(target_path);
+                          }
                           // Having finally completed all the tests, we can highlight the drop target.
                           if(!failed) {
                                 valid = true;
+                          }
                           else {
                                 ///ystem.err.println("Invalid. Target is descendant of itself.");
+                          }
+                     }
                      else {
                           ///ystem.err.println("Read only.");
+                     }
+                }
                 else {
                      ///ystem.err.println("Leaf node. Children not allowed.");
+                }
                 previous_path = target_path;
+          }
           else {
                 if(target_path == null) {
                      previous_path = null;
+                }
+          }
           return valid;
+     }
+        if(!target_node.isLeaf()) {
+        // Now we check if the node is readonly.
+        if(!target_node.isReadOnly()) {
+            // Finally we check the target path against the paths in the selection to ensure we are not adding to our own ancestors!
+            TreePath[] selection = group.getSelection();
+            boolean failed = false;
+            for(int i = 0; !failed && selection != null && i < selection.length; i++) {
+            failed = selection[i].isDescendant(target_path);
+            }
+            // Having finally completed all the tests, we can highlight the drop target.
+            if(!failed) {
+            valid = true;
+            }
+            else {
+            ///ystem.err.println("Invalid. Target is descendant of itself.");
+            }
+        }
+        else {
+            ///ystem.err.println("Read only.");
+        }
+        }
+        else {
+        ///ystem.err.println("Leaf node. Children not allowed.");
+        }
+        previous_path = target_path;
+    }
+    else {
+        if(target_path == null) {
+        previous_path = null;
+        }
+    }
+    return valid;
+    }
+}

trunk/gli/src/org/greenstone/gatherer/gui/tree/DragTreeCellRenderer.java

-              r4293
+              r4366
 public class DragTreeCellRenderer
      extends DefaultTreeCellRenderer {
+    extends DefaultTreeCellRenderer {
      private boolean in_focus = false;
      private Color selection_background;
      private Color selection_foreground;
+    private boolean in_focus = false;
+    private Color selection_background;
+    private Color selection_foreground;
      public DragTreeCellRenderer() {
           super();
           selection_background = getBackgroundSelectionColor();
           selection_foreground = getTextSelectionColor();
+     }
+    public DragTreeCellRenderer() {
+    super();
+    selection_background = getBackgroundSelectionColor();
+    selection_foreground = getTextSelectionColor();
+    }
      public void gainFocus() {
           setBackgroundSelectionColor(selection_background);
           setTextSelectionColor(selection_foreground);
+     }
+    public void gainFocus() {
+    setBackgroundSelectionColor(selection_background);
+    setTextSelectionColor(selection_foreground);
+    }
      public void loseFocus() {
           setBackgroundSelectionColor(Color.lightGray);
           setTextSelectionColor(Color.black);
+     }
+    public void loseFocus() {
+    setBackgroundSelectionColor(Color.lightGray);
+    setTextSelectionColor(Color.black);
+    }
+}

Context Navigation

Legend:

Download in other formats: