Changeset 18364 for gli/branches/rtl-gli

Timestamp:

2009-01-12T11:40:15+13:00 (15 years ago)

Author:

kjdon

Message:

updated the rtl-gli branch with files from trunk. Result of a merge 14807:18318, and fixed some conflicts. I think this is the last commit following merging the files. Haven't tried to compile yet... here goes...

Location:

gli/branches/rtl-gli/src/org/greenstone/gatherer/gui

Files:

• AboutDialog.java (modified) (2 diffs)
• CreatePane.java (modified) (20 diffs)
• DeleteCollectionPrompt.java (modified) (1 diff)
• DesignPane.java (modified) (2 diffs)
• DownloadPane.java (modified) (7 diffs)
• EnrichPane.java (modified) (1 diff)
• ExplodeMetadataDatabasePrompt.java (modified) (2 diffs)
• ExportAsPrompt.java (modified) (21 diffs)
• FedoraLogin.java (copied) (copied from gli/trunk/src/org/greenstone/gatherer/gui/FedoraLogin.java )
• Filter.java (modified) (2 diffs)
• FormatPane.java (modified) (2 diffs)
• GUIManager.java (modified) (7 diffs)
• HelpFrame.java (modified) (2 diffs)
• NewCollectionDetailsPrompt.java (modified) (2 diffs)
• OpenCollectionDialog.java (modified) (2 diffs)
• OptionsPane.java (modified) (7 diffs)
• Preferences.java (modified) (11 diffs)
• PreviewButton.java (modified) (1 diff)
• ReplaceSrcDocWithHtmlPrompt.java (copied) (copied from gli/trunk/src/org/greenstone/gatherer/gui/ReplaceSrcDocWithHtmlPrompt.java )
• SimpleResultDialog.java (modified) (1 diff)
• URLField.java (modified) (2 diffs)
• WarningDialog.java (modified) (9 diffs)

gli/branches/rtl-gli/src/org/greenstone/gatherer/gui/AboutDialog.java

@@ -34 +34 @@
 import java.awt.event.*;
 import javax.swing.*;
+
+import org.greenstone.gatherer.Configuration;
 import org.greenstone.gatherer.Dictionary;
 import org.greenstone.gatherer.Gatherer;
@@ -73 +75 @@
         upper_pane.setComponentOrientation(Dictionary.getOrientation());
         
-    ImageIcon icon = JarTools.getImage("gatherer_medium.gif");
+    String gmedium_image = "gatherer_medium.gif";
+    if (Configuration.fedora_info.isActive()) {
+        gmedium_image = "fli-" + gmedium_image;
+    }
+
+    ImageIcon icon = JarTools.getImage(gmedium_image);
     ImageIcon scaled_icon = new ImageIcon(icon.getImage().getScaledInstance(ICON_SIZE, ICON_SIZE, Image.SCALE_DEFAULT));
     JLabel icon_label = new JLabel(scaled_icon);

gli/branches/rtl-gli/src/org/greenstone/gatherer/gui/CreatePane.java

@@ -53 +53 @@
 import org.greenstone.gatherer.shell.GBuildProgressMonitor;
 import org.greenstone.gatherer.shell.GImportProgressMonitor;
+import org.greenstone.gatherer.shell.GScheduleProgressMonitor; 
 import org.greenstone.gatherer.shell.GShell;
 import org.greenstone.gatherer.shell.GShellEvent;
@@ -61 +62 @@
 import org.greenstone.gatherer.util.Utility;
 
+import org.greenstone.gatherer.collection.CollectionManager;
 
 /** This class provides a GUI view showing some statistics on your current collection, and options for building it. As the collection is built this initial view is replaced with one showing progress bars and a message log of the creation process. This log can be later accessed via the options tree located in the center of the initial pane. This class is also responsible for creating the GShellProgressMonitors that are then attatched to external shell processes, and calling the methods in the CollectionManager for actually importing and building the collection. <br><BR>
@@ -93 +95 @@
     /** This monitor tracks the import processes progress. */
     private GShellProgressMonitor import_monitor = null;
+    /** This monitor tracks the schedule processes progress. */ 
+    private GShellProgressMonitor schedule_monitor = null; 
     /** The button for begining the building processes. */
     private JButton build_button = null;
     /** The button for stopping the building processes. */
     private JButton cancel_button = null;
+    /** The button for setting up scheduling */
+    private JButton schedule_button = null; 
     /** The button for viewing the collection. */
     private JButton preview_button = null;
@@ -149 +155 @@
     public String homepage = null;
 
-
     /** The constructor creates important helper classes, and initializes all the components.
      * @see org.greenstone.gatherer.collection.CollectionManager
@@ -194 +199 @@
     Gatherer.c_man.registerBuildMonitor(build_monitor);
 
+    //We only need a schedule monitor for text output. No use for a progress bar!
+    
+    //progress_schedule_label = new JLabel(Dictionary.get("CreatePane.Schedule_Progress")); 
+    
+    schedule_monitor = new GScheduleProgressMonitor(); 
+    Gatherer.c_man.registerScheduleMonitor(schedule_monitor); 
+
     // And the simple panel
     slower_panel = new JPanel();
@@ -238 +250 @@
     }
     
+    BuildSimpleButtonListener bsbl = new BuildSimpleButtonListener(); 
     simple_build_button = new GLIButton(Dictionary.get("CreatePane.Build_Collection"), Dictionary.get("CreatePane.Build_Collection_Tooltip"));
-    simple_build_button.addActionListener(bbl);
-    
+    simple_build_button.addActionListener(bsbl);
+
     simple_cancel_button = new GLIButton(Dictionary.get("CreatePane.Cancel_Build"), Dictionary.get("CreatePane.Cancel_Build_Tooltip"));
     simple_cancel_button.addActionListener(cbl);
@@ -255 +268 @@
     
     bbl = null;
+    bsbl = null; 
     cbl = null;
     //pbl = null;
@@ -375 +389 @@
         sargument_configuration_panel = options_pane.buildImport(null);
         sargument_configuration_panel = options_pane.buildBuild(sargument_configuration_panel);
+        // if(CollectionManager.canDoScheduling()) {
+        //  sargument_configuration_panel = options_pane.buildSchedule(sargument_configuration_panel); 
+        // }
     }
     else {
@@ -498 +515 @@
         sargument_configuration_panel = options_pane.buildImport(null);
         sargument_configuration_panel = options_pane.buildBuild(sargument_configuration_panel);
+        //  if(CollectionManager.canDoScheduling()) {
+        //  sargument_configuration_panel = options_pane.buildSchedule(sargument_configuration_panel);
+        //}
         }
         else {
@@ -545 +565 @@
     DebugStream.println("In CreatePane::processComplete(" + event.getType() + ")...");
     if(event.getStatus() == GShell.OK) {
-        if(event.getType() == GShell.BUILD) {
+        if(event.getType() == GShell.SCHEDULE) {
+        
+        processing = false; 
+        build_button.setEnabled(true);
+        cancel_button.setEnabled(false);
+        //preview_button.setEnabled(true);
+        //only enable preview if the collection has been built. 
+        preview_button.setEnabled(Gatherer.c_man.built());
+        simple_build_button.setEnabled(true);
+        simple_cancel_button.setEnabled(false);
+        simple_preview_button.setEnabled(Gatherer.c_man.built()); 
+        int status = event.getStatus();
+        document.setSpecialCharacter(OptionsPane.SCHEDULED); 
+        options_pane.resetFileEntry();
+        build_monitor.reset();
+        import_monitor.reset();
+        if(Configuration.getMode() >= THRESHOLD) {
+            control_pane.add(button_pane, BorderLayout.SOUTH); 
+            card_layout.show(main_pane, CONTROL); 
+        }
+        }
+        else if(event.getType() == GShell.BUILD) {
         processing = false;
         build_button.setEnabled(true);
         cancel_button.setEnabled(false);
-        //preview_button.setEnabled(true);
+        preview_button.setEnabled(true);
         simple_build_button.setEnabled(true);
         simple_cancel_button.setEnabled(false);
@@ -570 +611 @@
         build_button.setEnabled(true);
         // The build may have failed, but a previous index may still be in place
-        //preview_button.setEnabled(Gatherer.c_man.built());
+        preview_button.setEnabled(Gatherer.c_man.built());
 
         simple_build_button.setEnabled(true);
         simple_cancel_button.setEnabled(false);
-        //simple_preview_button.setEnabled(Gatherer.c_man.built());
+        simple_preview_button.setEnabled(Gatherer.c_man.built());
         if(event.getStatus() == GShell.CANCELLED) {
         document.setSpecialCharacter(OptionsPane.CANCELLED);
@@ -604 +645 @@
     Collection current_collection = Gatherer.c_man.getCollection();
     if (current_collection != previous_collection && !Gatherer.c_man.isImporting()) {
-        this.options_pane = new OptionsPane(current_collection.import_options, current_collection.build_options);
+        this.options_pane = new OptionsPane(current_collection.import_options, current_collection.build_options, current_collection.schedule_options);
         if (previous_collection != null) {
         // clear the log
@@ -620 +661 @@
         sargument_configuration_panel = options_pane.buildImport(null);
         sargument_configuration_panel = options_pane.buildBuild(sargument_configuration_panel);
+        //if(CollectionManager.canDoScheduling()) {
+        //sargument_configuration_panel = options_pane.buildSchedule(sargument_configuration_panel); 
+        //}
         sargument_configuration_scroll = new JScrollPane(sargument_configuration_panel);
             sargument_configuration_scroll.setComponentOrientation(Dictionary.getOrientation());
@@ -654 +698 @@
         Collection collection = Gatherer.c_man.getCollection();
         String collection_name = collection.getName();
-        if(!collection.getMetadataChanged() && !collection.getFilesChanged() && isIncremental()) {
-        //Only design options have changes, and we want to be smart in the way we handle them.
-        int rebuildTypeRequired = CollectionDesignManager.getRebuildTypeRequired();
-        if (rebuildTypeRequired == CollectionDesignManager.BUILDCOL) {
-            // Just run the buildcol command.
-            DebugStream.println("Just want to run buildcol.pl");
-            prepareForBuild();
-            Gatherer.c_man.buildCollection(isIncremental());
+
+        //if button is labelled for Building
+        if(event.getActionCommand().equals(Dictionary.get("CreatePane.Build_Collection"))) { 
+
+        if(!collection.getMetadataChanged() && !collection.getFilesChanged() && isIncremental()) {
+            //Only design options have changes, and we want to be smart in the way we handle them.
+            int rebuildTypeRequired = CollectionDesignManager.getRebuildTypeRequired();
+            if (rebuildTypeRequired == CollectionDesignManager.BUILDCOL) {
+            // Just run the buildcol command.
+            DebugStream.println("Just want to run buildcol.pl");
+            prepareForBuild();
+            Gatherer.c_man.buildCollection(isIncremental());
+            }
+            else if (rebuildTypeRequired == CollectionDesignManager.ALL) {
+            // Do both import and buildcol
+            DebugStream.println("Want to do a complete build");
+            prepareForBuild();
+            Gatherer.c_man.importCollection(); //This starts the building process.
+            }
+            else {
+            //Nothing at all needs doing.
+            //This is bad HCI. Maybe should disable the build button in this situation?
+            JOptionPane.showMessageDialog(Gatherer.g_man, Dictionary.get("CreatePane.Minimal_Build_Not_Required"));
+            }
         }
-        else if (rebuildTypeRequired == CollectionDesignManager.ALL) {
-            // Do both import and buildcol
-            DebugStream.println("Want to do a complete build");
+        else {
+            //Do a complete build.
             prepareForBuild();
             Gatherer.c_man.importCollection(); //This starts the building process.
-        }
-        else {
-            //Nothing at all needs doing.
-            //This is bad HCI. Maybe should disable the build button in this situation?
-            JOptionPane.showMessageDialog(Gatherer.g_man, Dictionary.get("CreatePane.Minimal_Build_Not_Required"));
-        }
-        }
-        else {
-        //Do a complete build.
-        prepareForBuild();
-        Gatherer.c_man.importCollection(); //This starts the building process.
-        }
+        } 
+
+        } else {   //button is labelled for setting up scheduling
+
+        //this needs to be called to configure buttons... but no building is done
+        prepareForBuild(); 
+    
+        Gatherer.c_man.scheduleBuild(isIncremental()); 
+        }
+        
         //Re-setting the rebuildTypeRequired is handled by CollectionManager.processComplete(GShellEvent)
     }
-
+        
     /**
      * This does some stuff that is needed before a collection can be built.
@@ -721 +778 @@
     }
     
+    /** I hope this works. Wendy */ 
+    private class BuildSimpleButtonListener
+    implements ActionListener {
+    /**
+     * This method checks to see what needs to be done for a build, and starts the process off.
+     * A complete build proccess is started by {@link CollectionManager.importCollection()}, which then imports and builds the collection.
+     * However, this doesn't always happen, as sometimes an incremental build will do :-)
+     * @param event An <strong>ActionEvent</strong> who, thanks to the power of object oriented programming, we don't give two hoots about.
+     * @see org.greenstone.gatherer.Gatherer
+     * @see org.greenstone.gatherer.collection.CollectionManager
+     * @see org.greenstone.gatherer.gui.BuildOptions
+     * @see org.greenstone.gatherer.shell.GShellProgressMonitor
+     */
+    public void actionPerformed(ActionEvent event) {
+        Collection collection = Gatherer.c_man.getCollection();
+        String collection_name = collection.getName();
+
+        //prepareForBuild(); 
+        if(!collection.getMetadataChanged() && !collection.getFilesChanged() && isIncremental()) {
+            //Only design options have changes, and we want to be smart in the way we handle them.
+            int rebuildTypeRequired = CollectionDesignManager.getRebuildTypeRequired();
+            if (rebuildTypeRequired == CollectionDesignManager.BUILDCOL) {
+            // Just run the buildcol command.
+            DebugStream.println("Just want to run buildcol.pl");
+            prepareForBuild();
+            Gatherer.c_man.buildCollection(isIncremental());
+            }
+            else if (rebuildTypeRequired == CollectionDesignManager.ALL) {
+            // Do both import and buildcol
+            DebugStream.println("Want to do a complete build");
+            prepareForBuild();
+            Gatherer.c_man.importCollection(); //This starts the building process.
+            }
+            else {
+            //Nothing at all needs doing.
+            //This is bad HCI. Maybe should disable the build button in this situation?
+            JOptionPane.showMessageDialog(Gatherer.g_man, Dictionary.get("CreatePane.Minimal_Build_Not_Required"));
+            }
+        }
+        else {
+            //Do a complete build.
+            prepareForBuild();
+            Gatherer.c_man.importCollection(); //This starts the building process.
+        }
+        
+        // have commented this out for now - scheduling currently not
+        // available except in expert mode
+        //only schedule in SYSTEM mode - also done in EXPERT mode, but that is handled elsewhere
+        /*      if(Configuration.getMode() ==  Configuration.SYSTEMS_MODE) {
+           if(Gatherer.c_man.getCollection().schedule_options.getValueEnabled("schedule")) {
+            Gatherer.c_man.getCollection().schedule_options.setValue("action",true,"add"); 
+            Gatherer.c_man.getCollection().schedule_options.setValue("email",false, null); 
+            Gatherer.c_man.getCollection().schedule_options.setValue("smtp",false, null);
+            Gatherer.c_man.getCollection().schedule_options.setValue("toaddr",false, null);  
+            Gatherer.c_man.getCollection().schedule_options.setValue("fromaddr",false, null);   
+            Gatherer.c_man.getCollection().schedule_options.setValue("frequency",false, null);  
+            Gatherer.c_man.scheduleBuild(isIncremental()); 
+        } else {
+            //need to turn off existing scheduling
+            Gatherer.c_man.getCollection().schedule_options.setValue("action",true,"delete"); 
+            Gatherer.c_man.scheduleBuild(isIncremental()); 
+            
+        }
+        }
+        */
+        //Re-setting the rebuildTypeRequired is handled by CollectionManager.processComplete(GShellEvent)
+    }
+
+    /**
+     * This does some stuff that is needed before a collection can be built.
+     * For example, buttons are enabled/disabled, and certain flags are set.
+     * This is called from {@link actionPerformed(ActionEvent)}
+     */
+    private void prepareForBuild() {
+        // First we force the build options to be updated if we haven't already.
+        tree.valueChanged(null);
+        
+        // Remember that for lower thresholds the above doesn't work, so try this instead
+        if(Configuration.getMode() < THRESHOLD) {
+        options_pane.update(sargument_configuration_panel);
+        }
+        
+        // Now go about building.
+        build_button.setEnabled(false);
+        cancel_button.setEnabled(true);
+        preview_button.setEnabled(false);
+        
+        simple_build_button.setEnabled(false);
+        simple_cancel_button.setEnabled(true);
+        simple_preview_button.setEnabled(false);
+        
+        document = options_pane.createNewLogDocument();
+        log_textarea.setDocument(document);
+        options_pane.log_textarea.setDocument(document);
+        // Change the view.
+        processing = true;
+        if(Configuration.getMode() >= THRESHOLD) {
+        progress_pane.add(button_pane, BorderLayout.SOUTH);
+        card_layout.show(main_pane, PROGRESS);
+        }
+        // Reset the stop flag in all the process monitors, just incase.
+        ((GBuildProgressMonitor)build_monitor).reset();
+        import_monitor.setStop(false);
+    }
+    }
     
+
     /** This class serves as the listener for actions on the cancel button. */
     private class CancelButtonListener
@@ -771 +934 @@
     /** The node corresponding to the importing options view. */
     private OptionTreeNode importing = null;
+    /** The node corresponding to the scheduling options view. */ 
+    private OptionTreeNode scheduling = null; 
     /** The node corresponding to the log view. */
     private OptionTreeNode log       = null;
@@ -793 +958 @@
         importing = new OptionTreeNode(Dictionary.get("CreatePane.Import"));
         importing.setToolTipText(Dictionary.get("CreatePane.Import_Tooltip"));
+        scheduling = new OptionTreeNode(Dictionary.get("CreatePane.Schedule"));
+        scheduling.setToolTipText(Dictionary.get("CreatePane.Schedule_Tooltip")); 
+
         log = new OptionTreeNode(Dictionary.get("CreatePane.Log"));
         log.setToolTipText(Dictionary.get("CreatePane.Log_Tooltip"));
@@ -801 +969 @@
         model.insertNodeInto(importing, options, 0);
         model.insertNodeInto(building, options, 1);
-        model.insertNodeInto(log, options, 2);
+        model.insertNodeInto(scheduling, options, 2); 
+        model.insertNodeInto(log, options, 3);
         // Expand the root node
         expandPath(new TreePath(options));
@@ -831 +1000 @@
         scroll_pane = null;
         }
+        if(node != null && node.equals(log)) { 
+        build_button.setActionCommand(Dictionary.get("CreatePane.Build_Collection")); 
+        build_button.setText(Dictionary.get("CreatePane.Build_Collection"));    
+        }
         if(node != null && node.equals(building)) {
+    build_button.setActionCommand(Dictionary.get("CreatePane.Build_Collection"));       
+        build_button.setText(Dictionary.get("CreatePane.Build_Collection"));
+ 
+
         previous_pane = options_pane.buildBuild(null);
         scroll_pane = new JScrollPane(previous_pane);
@@ -838 +1015 @@
         }
         else if(node != null && node.equals(importing)) {
+        build_button.setActionCommand(Dictionary.get("CreatePane.Build_Collection")); 
+        build_button.setText(Dictionary.get("CreatePane.Build_Collection")); 
+
         previous_pane = options_pane.buildImport(null);
         scroll_pane = new JScrollPane(previous_pane);
         right.add(scroll_pane, BorderLayout.CENTER);
         //target_pane.add(previous_pane, BorderLayout.CENTER);
+        }
+        else if(node != null && node.equals(scheduling) && CollectionManager.canDoScheduling()) { 
+        build_button.setActionCommand(Dictionary.get("CreatePane.Schedule_Build")); 
+        build_button.setText(Dictionary.get("CreatePane.Schedule_Build"));
+ 
+        previous_pane = options_pane.buildSchedule(null); 
+        scroll_pane = new JScrollPane(previous_pane);
+        right.add(scroll_pane, BorderLayout.CENTER);
         }
         else {

gli/branches/rtl-gli/src/org/greenstone/gatherer/gui/DeleteCollectionPrompt.java

@@ -269 +269 @@
         confirmation.setSelected(false);
         if(!list.isSelectionEmpty()) {
-        confirmation.setEnabled(true);
         collection = (BasicCollectionConfiguration) list.getSelectedValue();
-        args = new String[3];
-        args[0] = collection.getCreator();
-        args[1] = collection.getMaintainer();
-        args[2] = collection.getDescription();
-        details.setText(Dictionary.get("DeleteCollectionPrompt.Details", args));
-        details.setCaretPosition(0);
+
+        String currentColName = (Gatherer.c_man.getCollection() == null) ? "" : Gatherer.c_man.getCollection().getName();
+        if(!collection.getShortName().equals(currentColName)) { 
+            // the selected collection can only be deleted if it is NOT the collection that is currently open
+            confirmation.setEnabled(true);
+            confirmation.setToolTipText(null); // no tooltip
+            ok_button.setToolTipText(null);
+
+            args = new String[3];
+            args[0] = collection.getCreator();
+            args[1] = collection.getMaintainer();
+            args[2] = collection.getDescription();
+            details.setText(Dictionary.get("DeleteCollectionPrompt.Details", args));
+            details.setCaretPosition(0);
+        } else { // trying to delete the collection that is open at present
+            // add a tooltip saying to the confirmation checkbox saying that the current collection can't be deleted 
+            String tooltip = Dictionary.get("DeleteCollectionPrompt.Cannot_Delete_Open_Collection_Tooltip", 
+                            collection.getName());
+            confirmation.setToolTipText(tooltip);
+            ok_button.setToolTipText(tooltip);
+            // delete/ok button and confirmation checkbox should be disabled
+            ok_button.setEnabled(false);
+            confirmation.setEnabled(false);
+            confirmation.setSelected(false);
+        }
         }
         else {

gli/branches/rtl-gli/src/org/greenstone/gatherer/gui/DesignPane.java

@@ -40 +40 @@
 import org.greenstone.gatherer.cdm.CollectionDesignManager;
 import org.greenstone.gatherer.cdm.Control;
+
+import org.greenstone.gatherer.Configuration;
+
 public class DesignPane 
     extends BaseConfigPane {
@@ -46 +49 @@
     public DesignPane() {
     super();
-    contents = new String [] { "CDM.GUI.Plugins", "CDM.GUI.Indexes", "CDM.GUI.Subcollections",  "CDM.GUI.Classifiers" };
+    if (Configuration.fedora_info.isActive()) {
+        contents = new String [] { "CDM.GUI.Plugins" };
+    }
+    else {
+        contents = new String [] { "CDM.GUI.Plugins", "CDM.GUI.Indexes", "CDM.GUI.Subcollections",  "CDM.GUI.Classifiers" };
+    }
     
     }

gli/branches/rtl-gli/src/org/greenstone/gatherer/gui/DownloadPane.java

@@ -185 +185 @@
     edit_pane.add(mode_pane,BorderLayout.CENTER);
     edit_pane.add(button_pane,BorderLayout.PAGE_END);
-
+    
     // Add to "this"
     setBorder(BorderFactory.createEmptyBorder(5,5,5,5));
@@ -242 +242 @@
         String launch = launch_str.toString();      
         System.err.println("*** launch = " + launch);
-        
+
         URL launch_url = new URL(launch);
         URLConnection launch_connection = launch_url.openConnection();
@@ -514 +514 @@
     implements ActionListener {
     public void actionPerformed(ActionEvent event) {
-        
+
         if(checkURL(true) && checkProxy() == true) {
         
+        // Proxy settings are now set. Check that the url is not a redirect, else get
+        // redirect url (we do this step in order to avoid some unintuitive behaviour from wget)
+        Download current_download = (Download)download_map.get(mode);
+        Argument arg_url = current_download.getArgument("url");
+        if(arg_url != null) { // it's null for z3950 and possibly for other downloaders
+            String url_str = arg_url.getValue();
+            String redirect_url_str = getRedirectURL(url_str);
+            
+            // only update the Argument and its GUI ArgumentControl if the URL
+            // has in fact changed
+            if(!url_str.equals(redirect_url_str)) {
+            arg_url.setValue(redirect_url_str);
+            updateArgument(arg_url, redirect_url_str);
+            }
+        }
         getter.newDownloadJob((Download)download_map.get(mode) ,mode,proxy_url);
         }
     }
     }
+
+    /**
+     * The Java code here will retrieve the page at the given url. If the response code is 
+     * a redirect, it will get the redirect url so that wget may be called with the proper url. 
+     * This preprocessing of the URL is necessary because:
+     * Wget does not behave the way the browser does when faced with urls of the form
+     * http://www.englishhistory.net/tudor/citizens and if that page does not exist.
+     * The directory listing with a slash at the end (http://www.englishhistory.net/tudor/citizens/)
+     * does exist, however. In order to prevent wget from assuming that the root URL
+     * to traverse is http://www.englishhistory.net/tudor/ instead of the intended
+     * http://www.englishhistory.net/tudor/citizens/, we need give wget the redirect location
+     * that's returned when we initially make a request for http://www.englishhistory.net/tudor/citizens
+     * The proper url is sent back in the Location header, allowing us to bypass wget's 
+     * unexpected behaviour.
+     * This method ensures that urls like http://www.nzdl.org/niupepa also continue to work:
+     * there is no http://www.nzdl.org/niupepa/ page, because this url actually redirects to an 
+     * entirely different URL.
+     * @return the redirect url for the given url if any redirection is involved, or the
+     * url_str.
+     */
+    private String getRedirectURL(String url_str) {
+    HttpURLConnection connection = null;
+    if(url_str.startsWith("http:")) { // only test http urls
+        try {
+        URL url = new URL(url_str); 
+        connection = (HttpURLConnection)url.openConnection(); //new HttpURLConnection(url);
+        // don't let it automatically follow redirects, since we want to
+        // find out whether we are dealing with redirects in the first place
+        connection.setInstanceFollowRedirects(false);
+        
+        // now check for whether we get a redirect response
+        // HTTP Codes 3xx are redirects, http://www.w3.org/Protocols/rfc2616/rfc2616-sec10.html
+        int responseCode = connection.getResponseCode();
+        if(responseCode >= 300 && responseCode < 400) { 
+            String responseMsg = connection.getResponseMessage();
+
+            // Get the Location header since this specifies the new location of the resource
+            String location = connection.getHeaderField("Location");
+            
+            // this becomes the url that wget should download from
+            url_str = location.trim();
+        }
+        
+        connection.disconnect();
+        } catch(Exception e) {
+        if(connection != null) {
+            connection.disconnect();
+        }
+        System.err.println("Checking redirection. Tried to connect to "
+                   + url_str + ",\nbut got exception: " + e);
+        }       
+    } 
+
+    return url_str;
+    }
+
     
+    /** For a string-based Argument whose value has changed, this method
+     * updates the GUI ArgumentControl's value correspondingly. */
+    private void updateArgument(Argument arg, String value) {
+    for(int i = 0; i < options_pane.getComponentCount(); i++) {
+        Component component = options_pane.getComponent(i);
+        if(component instanceof ArgumentControl) {
+        ArgumentControl control = (ArgumentControl)component;
+        if(control.getArgument() == arg) {
+            control.setValue(value);
+            control.repaint();
+        }
+        }
+    }
+    }
 
     private boolean checkURL(boolean checkRequired){
@@ -568 +653 @@
         
             int count = 0;
+        // Only for wget, need to avoid a second automatic authentication popup (first asks
+        // the proxy authentication for wget, and the second will ask the same for the realm)
+        // Once the authentication has been reused, it will set the GAuthenticator state back to REGULAR
+        GAuthenticator.setMode(GAuthenticator.DOWNLOAD);
         while(count < 3 && (user_pass = (String) GAuthenticator.authentications.get(address)) == null) {
         Authenticator.requestPasswordAuthentication(proxy_host, null, Integer.parseInt(proxy_port), "http://", Dictionary.get("WGet.Prompt"), "HTTP");
         count++;
         }
-
         if(count >= 3) {
         return false;
@@ -579 +667 @@
         if(user_pass.indexOf("@") != -1) {
             
-        // Write the use proxy command - we don't do this anymore, instead we set environment variables - hopefully these can't be spied on like the follwoing can (using ps) - actually the environment stuff didn't work for windows, so lets go back to this
+        // Write the use proxy command - we don't do this anymore, instead we set environment variables - hopefully these can't be spied on like the following can (using ps) - actually the environment stuff didn't work for windows, so lets go back to this
         if (Utility.isWindows()) {
              
@@ -607 +695 @@
            
            }
-
+        
            return true;
         }
@@ -615 +703 @@
 
     }
-
+    
     return true;
     }

gli/branches/rtl-gli/src/org/greenstone/gatherer/gui/EnrichPane.java

@@ -273 +273 @@
 
 
-    /** Called whenever the collection tree selection changes. This causes the metadata value table to be rebuilt. */
-    public void valueChanged(TreeSelectionEvent event)
+  /** Allows other classes to request the enrich pane to prepare for metadata
+   *  saving.
+   *  @author John Thompson, DL Consulting Ltd
+   */
+  public void stopEditingAndRebuild()
+  {
+    // Update the metadata value table (and consequently, the metadata value tree)
+    metadata_value_table_pane.stopEditingAndRebuild(file_nodes);
+  }
+  /** stopEditingAndRebuild() **/
+  
+  /** Called whenever the collection tree selection changes. This causes the metadata value table to be rebuilt. */
+  public void valueChanged(TreeSelectionEvent event)
     {
     // If we haven't got focus then it must have been a selection in the Gather pane, so don't bother rebuilding

gli/branches/rtl-gli/src/org/greenstone/gatherer/gui/ExplodeMetadataDatabasePrompt.java

@@ -279 +279 @@
         String collection_name = CollectionManager.getLoadedCollectionName();
         String collection_directory_path = CollectionManager.getCollectionDirectoryPath(collection_name);
-        String metadata_file_relative_path = RemoteGreenstoneServer.getPathRelativeToDirectory(metadata_file, collection_directory_path);
+        String metadata_file_relative_path = Gatherer.remoteGreenstoneServer.getPathRelativeToDirectory(
+                                                          metadata_file, collection_directory_path);
         command_parts_list.add("-file");
         command_parts_list.add(metadata_file_relative_path);
@@ -350 +351 @@
         if (Gatherer.isGsdlRemote) {
             Utility.delete(metadata_file.getParentFile());
-            RemoteGreenstoneServer.downloadCollectionFile(CollectionManager.getLoadedCollectionName(), metadata_file.getParentFile());
+            Gatherer.remoteGreenstoneServer.downloadCollectionFile(
+                             CollectionManager.getLoadedCollectionName(), metadata_file.getParentFile());
         }
 

gli/branches/rtl-gli/src/org/greenstone/gatherer/gui/ExportAsPrompt.java

@@ -83 +83 @@
 
     private ArrayList all_collections = null;
-    private ArrayList selected_collections = null;
-    /** The list of collections to include in exported cd-rom/dvd image */
-    private CheckList list = null;
+    private BasicCollectionConfiguration selected_collection = null;
+  /** The list of collections to export */
+    private JList list = null;
     /** The currently selected collection for deletion. */
     private BasicCollectionConfiguration collection = null;
@@ -159 +159 @@
     plugoutMap.put("DSpace","dublin-core.xml");
         plugoutMap.put("MARCXML","doc.xml");   
-    plugoutMap.put("METS","doctxt.xml,docmets.xml");     
-    plugoutMap.put("GA","doc.xml");
-
+    plugoutMap.put("GreenstoneMETS","doctxt.xml,docmets.xml");     
+    plugoutMap.put("FedoraMETS","doctxt.xml,docmets.xml");     
+
+    // this is the order we want them to appear in the list
+    String [] saveas_formats = {"GreenstoneMETS", "FedoraMETS", "MARCXML", "DSpace"};
         cancel_button = new GLIButton(Dictionary.get("General.Close"), Dictionary.get("General.Close_Tooltip"));
     
@@ -179 +181 @@
     instructions_textarea.setComponentOrientation(Dictionary.getOrientation());
              
-        // Save As
-    ArrayList saveas_formats = new ArrayList(plugoutMap.keySet());
        
         saveas_label = new JLabel(Dictionary.get("ExportAsPrompt.SaveAs")
@@ -187 +187 @@
         //saveas_label.setPreferredSize(LABEL_SIZE);
         
-        saveas_combobox = new JComboBox(saveas_formats.toArray());
+    saveas_combobox = new JComboBox(saveas_formats);
     saveas_combobox.setOpaque(false);
     saveas_combobox.setToolTipText(Dictionary.get("ExportAsPrompt.SaveAs_Tooltip"));
@@ -224 +224 @@
         convert_xml_field1 = new JTextField();
         convert_xml_field1.setComponentOrientation(Dictionary.getOrientation());
+    convert_xml_field1.setEnabled(false);
+
     convert_xml_field2 = new JTextField();
         convert_xml_field2.setComponentOrientation(Dictionary.getOrientation());
+    convert_xml_field2.setEnabled(false);
+
     mapping_xml_field = new JTextField();
         mapping_xml_field.setComponentOrientation(Dictionary.getOrientation());
+    mapping_xml_field.setEnabled(false);
 
         convert_xml_pane1 = new JPanel(new BorderLayout());
@@ -242 +247 @@
         
     all_collections = new ArrayList();
-    list = new CheckList(true);
+    //list = new CheckList(true);
+    list = new JList(getCollectionListModel());
     list_label = new JLabel(Dictionary.get("DeleteCollectionPrompt.Collection_List"));
     list_label.setComponentOrientation(Dictionary.getOrientation());
@@ -257 +263 @@
     folder_button.addActionListener(new FolderButtonListener());
    
-    
-    scanForCollections();
-    list.setListData(all_collections);
-
+       
     prompt = this;
     setSize(SIZE);
@@ -299 +302 @@
     ok_button = null;
     prompt = null;
-    if (selected_collections!=null) {
-        selected_collections.clear();
-        selected_collections = null;
-    }
+    selected_collection = null;
     title_field = null;
     title_label = null;
@@ -348 +348 @@
         
         String saveas = (String)saveas_combobox.getSelectedItem();
-    if (saveas.equals("MARCXML")){
-        convert_xml_pane.add(mapping_xml_pane);
-            convert_xml_pane.add(output_single_checkbox); 
-    }
-        else{
-        if (saveas.equals("METS")){
-        convert_xml_pane.add(convert_xml_pane2); 
-        }
-    }
-    convert_xml_pane.revalidate();
-    convert_xml_pane.repaint();
+    // force the updating of which fields we are displaying
+    saveas_combobox.setSelectedIndex(0);
 
         // Save as pane
@@ -441 +432 @@
     DebugStream.println("ExportAsPrompt.exportAsCollections()");
 
-    int num_collections = selected_collections.size();
-    if (num_collections == 0) return;
+    if (selected_collection == null) return;
+
     cd_title = title_field.getText();
 
@@ -479 +470 @@
         command_parts_list.add(export_dir);
 
-        if (!export_type.equals("METS") && xsl_file1 !=null){
+        if (!export_type.endsWith("METS") && xsl_file1 !=null){
              command_parts_list.add("-xsltfile");
              command_parts_list.add(xsl_file1.getPath()); 
@@ -508 +499 @@
 
             
-        if (export_type.equals("METS") && xsl_file1 !=null){
+        if (export_type.endsWith("METS") && xsl_file1 !=null){
              command_parts_list.add("-xslt_txt");
              command_parts_list.add(xsl_file1.getPath()); 
     }
 
-         if (export_type.equals("METS") && xsl_file2 !=null){
+         if (export_type.endsWith("METS") && xsl_file2 !=null){
              command_parts_list.add("-xslt_mets");
              command_parts_list.add(xsl_file2.getPath()); 
     }
        
-    for (int i = 0; i < num_collections; i++) {
-        command_parts_list.add(((BasicCollectionConfiguration) selected_collections.get(i)).getShortName());
-    }
+     command_parts_list.add( selected_collection.getShortName());
+     
 
     DebugStream.print("export command = ");
@@ -553 +543 @@
     public void resultPrompt(boolean success, String extra) {
     args = new String[2];
-    StringBuffer coll_names = new StringBuffer();
-    for (int i=0; i<selected_collections.size();i++) {
-        if (i>0) {
-        coll_names.append(", ");
-        }
-        BasicCollectionConfiguration complete_collection = (BasicCollectionConfiguration)selected_collections.get(i);
-        coll_names.append(complete_collection.getName() + StaticStrings.SPACE_CHARACTER + StaticStrings.OPEN_PARENTHESIS_CHARACTER + complete_collection.getShortName() + StaticStrings.CLOSE_PARENTHESIS_CHARACTER);
-        complete_collection = null;
-    }
-    
-    args[0] = coll_names.toString();
+    
+    // coll name
+    args[0] = selected_collection.getName() + StaticStrings.SPACE_CHARACTER + StaticStrings.OPEN_PARENTHESIS_CHARACTER + selected_collection.getShortName() + StaticStrings.CLOSE_PARENTHESIS_CHARACTER;
     
     String export_type = (String) saveas_combobox.getSelectedItem();       
@@ -588 +570 @@
 
     if (success) {
-        String successMessage
-        = (selected_collections.size()==1) 
-        ? "ExportAsPrompt.Successful_ExportOne"
-        : "ExportAsPrompt.Successful_ExportMany";
-
-        title = Dictionary.get("ExportAsPrompt.Successful_Title");
-        label = Dictionary.get(successMessage, args);
-        details = Dictionary.get("ExportAsPrompt.Successful_Details", args);
+      String successMessage = "ExportAsPrompt.Successful_ExportOne";
+      title = Dictionary.get("ExportAsPrompt.Successful_Title");
+      label = Dictionary.get(successMessage, args);
+      details = Dictionary.get("ExportAsPrompt.Successful_Details", args);
     } else {
-        String failedMessage
-        = (selected_collections.size()==1) 
-        ? "ExportAsPrompt.Failed_ExportOne"
-        : "ExportAsPrompt.Failed_ExportMany";
-
-        title = Dictionary.get("ExportAsPrompt.Failed_Title");
-        label = Dictionary.get(failedMessage, args);
-        details = Dictionary.get("ExportAsPrompt.Failed_Details", args);
-    }
-    SimpleResultDialog result_dialog = new SimpleResultDialog(title, label, details);
+      String failedMessage = "ExportAsPrompt.Failed_ExportOne";
+      title = Dictionary.get("ExportAsPrompt.Failed_Title");
+      label = Dictionary.get(failedMessage, args);
+      details = Dictionary.get("ExportAsPrompt.Failed_Details", args);
+    }
+    SimpleResultDialog result_dialog = new SimpleResultDialog(this, title, label, details);
     result_dialog.setVisible(true); // Blocks
     result_dialog.dispose();
@@ -618 +592 @@
      * @see org.greenstone.gatherer.util.Utility
      */
-    private void scanForCollections() {
+  private ListModel getCollectionListModel() {
+    DefaultListModel model = new DefaultListModel();
     // Start at the collect dir.
     File collect_directory = new File(Gatherer.getCollectDirectoryPath());
@@ -632 +607 @@
             if (config_file.exists()) {
             BasicCollectionConfiguration config = new BasicCollectionConfiguration(config_file);
-            all_collections.add(config);                
+            model.addElement(config);               
             config = null;
             }
@@ -638 +613 @@
         }
     }
+    return model;
     // Otherwise the collect directory doesn't actually exist, so there ain't much we can do.
-    }
+  }
 
 
@@ -697 +673 @@
     {
         // Can only export when something is ticked
-        ok_button.setEnabled(!list.isNothingTicked());
+        //ok_button.setEnabled(!list.isNothingTicked());
 
         if (list.isSelectionEmpty()) {
-        // This only happens when the dialog is first entered
         details_textarea.setText(Dictionary.get("DeleteCollectionPrompt.No_Collection"));
-        return;
-        }
-
-        collection = (BasicCollectionConfiguration) ((CheckListEntry) list.getSelectedValue()).getObject();
-        args = new String[3];
-        args[0] = collection.getCreator();
-        args[1] = collection.getMaintainer();
-        args[2] = collection.getDescription();
-        details_textarea.setText(Dictionary.get("DeleteCollectionPrompt.Details", args));
-        details_textarea.setCaretPosition(0);
-    }
-    }
-
-
+        ok_button.setEnabled(false);
+        }
+        else {
+          BasicCollectionConfiguration collection = (BasicCollectionConfiguration) list.getSelectedValue();
+          args = new String[3];
+          args[0] = collection.getCreator();
+          args[1] = collection.getMaintainer();
+          args[2] = collection.getDescription();
+          details_textarea.setText(Dictionary.get("DeleteCollectionPrompt.Details", args));
+          details_textarea.setCaretPosition(0);
+          ok_button.setEnabled(true);
+        }
+    }
+
+    }
     /** The OK button listener implementation. */
     private class OKButtonListener 
@@ -732 +708 @@
         ///ystem.err.println("OK Clicked");
         // Make sure there are some colls specified
-        selected_collections = list.getTicked();
+        selected_collection = (BasicCollectionConfiguration)list.getSelectedValue();
         error_message = new StringBuffer();
         
@@ -837 +813 @@
       
         convert_xml_button1.setEnabled(convert_xml_checkbox1.isSelected());
+        convert_xml_field1.setEnabled(convert_xml_checkbox1.isSelected());
         convert_xml_button2.setEnabled(convert_xml_checkbox2.isSelected());
+        convert_xml_field2.setEnabled(convert_xml_checkbox2.isSelected());
         convert_xml_button3.setEnabled(mapping_xml_checkbox.isSelected());
+        mapping_xml_field.setEnabled(mapping_xml_checkbox.isSelected());
             
     }
@@ -871 +850 @@
         }
 
-        if (!saveas.equals("METS")){
+        if (!saveas.endsWith("METS")){
     
         convert_xml_checkbox1.setText(Dictionary.get("ExportAsPrompt.ApplyXSL",(String)plugoutMap.get(saveas)));    

gli/branches/rtl-gli/src/org/greenstone/gatherer/gui/Filter.java

@@ -74 +74 @@
     static final private Dimension SIZE = new Dimension(100,30);
     /** Preprogrammed default filters. */
-    static final private String DEFAULTS[] = {"^.*\\.html?$", "^.*\\.xml$", "^.*\\.txt$", "(^.*\\.jpe?g$)|(^.*\\.png$)|(^.*\\.gif$)|(^.*\\.bmp$)|(^.*\\.tiff?$)"};
+    static final private String DEFAULTS[] 
+    = {"^.*\\.html?$", "^.*\\.xml$", "^.*\\.txt$", 
+       "(^.*\\.jpe?g$)|(^.*\\.png$)|(^.*\\.gif$)|(^.*\\.bmp$)|(^.*\\.tiff?$)",
+       "^.*\\.pdf$", 
+       "(^.*\\.docx?$)|(^.*\\.pptx?$)|(^.*\\.xlsx?$)|(^.*\\.od(t|s|p)$)"};
 
     /** Constructor.
@@ -241 +245 @@
             else if(temp_str.equals(Dictionary.get("Filter.3"))) {
             }
+            // PDF
+            else if(temp_str.equals(Dictionary.get("Filter.4"))) {
+            }
+            // Office Docs
+            else if(temp_str.equals(Dictionary.get("Filter.5"))) {
+            }
             else {
             // Make sure the filter isn't already in the list

gli/branches/rtl-gli/src/org/greenstone/gatherer/gui/FormatPane.java

@@ -70 +70 @@
             contents = new String []{ "CDM.GUI.General", "CDM.GUI.SearchMetadata", "CDM.GUI.Formats", "CDM.GUI.Translation" };
         } else {
-            contents = new String []{ "CDM.GUI.General", "CDM.GUI.SearchMetadata", "CDM.GUI.Formats", "CDM.GUI.Translation", "CDM.GUI.SuperCollection","CDM.GUI.Macros" };
+            contents = new String []{ "CDM.GUI.General", "CDM.GUI.SearchMetadata", "CDM.GUI.Formats", "CDM.GUI.Translation", "CDM.GUI.SuperCollection","CDM.GUI.Macros", "CDM.GUI.DepositorMetadata" };
         }
         JPanel side_panel = new JPanel ();
@@ -173 +173 @@
             return CollectionDesignManager.supercollection_manager.getControls ();
         }
+    if(type.equals ("CDM.GUI.DepositorMetadata")) {
+        return CollectionDesignManager.depositormetadata_manager.getControls ();
+    }
         return null;
     }

gli/branches/rtl-gli/src/org/greenstone/gatherer/gui/GUIManager.java

@@ -60 +60 @@
 import org.greenstone.gatherer.gui.tree.DragTree;
 import org.greenstone.gatherer.metadata.MetadataSet;
+import org.greenstone.gatherer.metadata.MetadataXMLFileManager;
 import org.greenstone.gatherer.remote.RemoteGreenstoneServer;
 import org.greenstone.gatherer.util.JarTools;
@@ -204 +205 @@
     }
     else if (esrc == menu_bar.file_save) {
-        Gatherer.c_man.saveCollection();
+      // Very important: make sure metadata values are saved too
+      enrich_pane.stopEditingAndRebuild();
+      // Make sure all the metadata has been saved to file
+      MetadataXMLFileManager.saveMetadataXMLFiles();
+      
+      Gatherer.c_man.saveCollection();
     }
 
@@ -346 +352 @@
 
         // Pretty corner icon
-        this.setIconImage(JarTools.getImage("gatherer_small.gif").getImage());
+        String gsmall_image = "gatherer_small.gif";
+        if (Configuration.fedora_info.isActive()) {
+        gsmall_image = "fli-" + gsmall_image;
+        }
+        this.setIconImage(JarTools.getImage(gsmall_image).getImage());
         // BorderLayout for the main screen. I'll try my best to avoid these in subcomponents as they're space greedy.
         content_pane.setLayout(new BorderLayout());
@@ -392 +402 @@
         if (Configuration.get("workflow.design", true)) {
         // "GUI.Design_Tooltip" is used automatically
-        tab_pane.addTab(Dictionary.get("GUI.Design"), JarTools.getImage("design.gif"), design_pane, Dictionary.get("GUI.Design_Tooltip"));
+        if (Configuration.fedora_info.isActive()) {
+            tab_pane.addTab("Plugins", JarTools.getImage("design.gif"), design_pane, Dictionary.get("GUI.Design_Tooltip"));
+        }
+        else {
+            tab_pane.addTab(Dictionary.get("GUI.Design"), JarTools.getImage("design.gif"), design_pane, Dictionary.get("GUI.Design_Tooltip"));
+        }
+
         tab_pane.setEnabledAt(tab_pane.indexOfComponent(design_pane), false);
         }
@@ -441 +457 @@
         remote_greenstone_server_progress_panel.setLayout(new BorderLayout());
         remote_greenstone_server_progress_panel.add(remote_greenstone_server_progress_label, BorderLayout.LINE_START);
-        remote_greenstone_server_progress_panel.add(RemoteGreenstoneServer.getProgressBar(), BorderLayout.CENTER);
+        remote_greenstone_server_progress_panel.add(Gatherer.remoteGreenstoneServer.getProgressBar(), BorderLayout.CENTER);
         content_pane.add(remote_greenstone_server_progress_panel, BorderLayout.SOUTH);
         }
@@ -467 +483 @@
     // If we have a collection open remember it for next time, then save it and close it
     if (Gatherer.c_man.ready()) {
-        Configuration.setString("general.open_collection", true, CollectionManager.getLoadedCollectionColFilePath());
+        Configuration.setString("general.open_collection"+Configuration.gliPropertyNameSuffix(), 
+                    true, CollectionManager.getLoadedCollectionColFilePath());
         saveThenCloseCurrentCollection();
     }
     else {
-        Configuration.setString("general.open_collection", true, null);
+        Configuration.setString("general.open_collection"+Configuration.gliPropertyNameSuffix(), true, null);
     }
 
@@ -650 +667 @@
     public void setTitle(String title, String name) {
     // Finally display the collection name in the title bar.
-    StringBuffer title_buffer = new StringBuffer(Gatherer.PROGRAM_NAME);
+    StringBuffer title_buffer = new StringBuffer(Configuration.getApplicationTitle());
     title_buffer.append(StaticStrings.SPACE_CHARACTER);
     title_buffer.append(Gatherer.PROGRAM_VERSION);
     title_buffer.append(StaticStrings.SPACE_CHARACTER);
     title_buffer.append(StaticStrings.SPACE_CHARACTER);
+    // Server version information
+    title_buffer.append(Gatherer.getServerVersionAsString());
+    title_buffer.append(StaticStrings.SPACE_CHARACTER);
+    title_buffer.append(StaticStrings.SPACE_CHARACTER); 
     // Describe the current user mode
     title_buffer.append(StaticStrings.MODE_STR);

gli/branches/rtl-gli/src/org/greenstone/gatherer/gui/HelpFrame.java

@@ -120 +120 @@
     setLocation((screen_size.width - SIZE.width) / 2, (screen_size.height - SIZE.height) / 2);
 
+
     // Pretty corner icon
-    this.setIconImage(JarTools.getImage("gatherer_small.gif").getImage());
+    String gsmall_image = "gatherer_small.gif";
+    if (Configuration.fedora_info.isActive()) {
+        gsmall_image = "fli-" + gsmall_image;
+    }
+
+    this.setIconImage(JarTools.getImage(gsmall_image).getImage());
 
     self = this;
@@ -238 +244 @@
         try {
         String help_index_file_path = getHelpFolder() + "help_index.xml";
-        Document document = XMLTools.parseXMLFile(help_index_file_path, true);
-
+        Document document = null;
+        if (Gatherer.isApplet && JarTools.getResource(help_index_file_path) != null) {
+            document = XMLTools.parseXMLFile(help_index_file_path, true);
+        }
+        
+        if (new File(help_index_file_path).exists()) {
+            document = XMLTools.parseXMLFile(help_index_file_path, false);
+        }       
+
+        if (document == null) {
+            String errormsg = "HelpFrame.HelpContentsTreeModel constructor(): There's no help document after parsing";
+            System.err.println(errormsg);
+            DebugStream.println(errormsg);
+            return;
+        }
         // Traverse the help hierarchy, building a tree representing its structure
         Node document_node = document.getFirstChild();

gli/branches/rtl-gli/src/org/greenstone/gatherer/gui/NewCollectionDetailsPrompt.java

@@ -248 +248 @@
     content_pane.add(bottom_pane, BorderLayout.SOUTH);
     // Final dialog setup & positioning.
+    getRootPane().setDefaultButton(create_button);
     Dimension screen_size = Configuration.screen_size;
     setLocation((screen_size.width - SIZE.width) / 2, (screen_size.height - SIZE.height) / 2);
@@ -288 +289 @@
     // Remote collections that aren't shared have the user's username prefixed to the collection name
     if (Gatherer.isGsdlRemote && personal_collection_button.isSelected()) {
-        name_buffer = new StringBuffer(RemoteGreenstoneServer.getUsername() + "-" + name_buffer.toString());
+        name_buffer = new StringBuffer(Gatherer.remoteGreenstoneServer.getUsername() + "-" + name_buffer.toString());
     }
 

gli/branches/rtl-gli/src/org/greenstone/gatherer/gui/OpenCollectionDialog.java

@@ -269 +269 @@
         return;
         }
+
+        load_collection_configs(data,collect_directory);
+
+    }
+
+
+    protected void load_collection_configs(TreeSet data, File collect_directory) {
+
         File[] collection_folders = collect_directory.listFiles();
+
         for(int i = 0; i < collection_folders.length; i++) {
         File collection_folder = collection_folders[i];
         String collection_foldername = collection_folder.getName();
+
         if(collection_folder.isDirectory() && !collection_foldername.equals(StaticStrings.MODEL_COLLECTION_NAME)) {
-            // this 'file_name' has already been prefixed by 'etc'
-            String file_name = (Gatherer.GS3)? Utility.CONFIG_GS3_FILE : Utility.CONFIG_FILE;
+            // this 'file_name' has already been prefixed by 'etc'
+            String file_name;
+            if (Gatherer.GS3){
+            convertToGS3Collection(collection_folder);
+            file_name = Utility.CONFIG_GS3_FILE;
+            }else{
+            file_name = Utility.CONFIG_FILE;
+            }
+            
             File config_file = new File(collection_folder, file_name);
             File collection_metadata_directory = new File(collection_folder, "metadata");
             if (collection_metadata_directory.exists() && config_file.exists()) {
             BasicCollectionConfiguration collection_configuration = new BasicCollectionConfiguration(config_file);
-            data.add(collection_configuration);
+
+            // look to see if group set?
+            // => if it is, don't add, but recurse to look for child collections in collect-group
+
+            if (collection_configuration.getCollectGroup().equals("true")) {
+                load_collection_configs(data, collection_folder);
+            }
+            else {
+                data.add(collection_configuration);
+            }
             }
             config_file = null;
@@ -290 +316 @@
         collect_directory = null;
     }
+
+
 
     public Object getElementAt(int index) {

gli/branches/rtl-gli/src/org/greenstone/gatherer/gui/OptionsPane.java

@@ -69 +69 @@
     static final public char CANCELLED = 'c';
     static final public char UNKNOWN = 'x';
+    static final public char SCHEDULED = 'd'; 
 
     static private int BUILD = 0;
     static private int IMPORT = 1;
-    static private int MINIMUM_ROWS = 11;
+    static private int SCHEDULE = 2; 
+    static private int MINIMUM_ROWS = 15;
     
     /** All process messages are written to this log text area. */
@@ -82 +84 @@
     private ScriptOptions build_options = null;
     private ScriptOptions import_options = null;
+    private ScriptOptions schedule_options = null;
 
     private FileEntry file_entry = null;
@@ -93 +96 @@
 
     /** The default constructor creates the few session length options, but either retrieves the rest from the current collection, or creates a default set of options. */
-    public OptionsPane(ScriptOptions import_options, ScriptOptions build_options) {
+    public OptionsPane(ScriptOptions import_options, ScriptOptions build_options, ScriptOptions schedule_options) {
     this.build_options = build_options;
     this.import_options = import_options;
+    this.schedule_options = schedule_options; 
     this.current_controls = new ArrayList();
     this.writing_documents = new Vector();
@@ -175 +179 @@
       build_arguments = null;
       return pane;
+    }
+
+    /**Wendy's attempt at writing a buildSchedule Jpanel. */
+    public JPanel buildSchedule(JPanel pane) {
+    //reset the arguments
+    if(pane ==  null) {
+        current_controls.clear(); 
+    }
+
+    ArrayList schedule_arguments = new ArrayList(); 
+    int current_mode = Configuration.getMode(); 
+
+    int total_schedule_argument_count = schedule_options.getArgumentCount();
+      
+      for(int i = 0; i < total_schedule_argument_count; i++) {
+        // Retrieve the argument so we know how to format the control.
+        Argument argument = schedule_options.getArgument(i);
+        
+        //A hack to make the disable_OAI option visible in the GLI for Greenstone 3
+        if(argument.getName().equals(StaticStrings.DISABLEOAI_STR) && Gatherer.GS3) {
+          argument.setHiddenGLI(false);
+        }
+        if(!argument.isHiddenGLI() && argument.getModeLevel() <= current_mode) {
+          // Now attempt to retrieve any existing value for this argument.
+          boolean enabled = schedule_options.getValueEnabled(argument.getName());
+          String value = schedule_options.getValue(argument.getName());
+          MyArgumentControl argument_control = new MyArgumentControl(SCHEDULE, argument, enabled, value);
+          schedule_arguments.add(argument_control);
+        }
+      }
+      current_controls.addAll(schedule_arguments);
+      
+      // Now that we know how many arguments there are we can build the pane to view them on. Modes lower than EXPERT can provide a previous pane on which to add the arguments.
+      if(pane == null || current_mode >= Configuration.EXPERT_MODE) {
+        pane = new JPanel();
+        pane.setBorder(BorderFactory.createEmptyBorder(5,5,5,5));
+        pane.setBackground(Configuration.getColor("coloring.collection_tree_background", false));
+        int argument_count = schedule_arguments.size();
+        // If in any of the higher detail modes, and assuming we don't want super phat argument controls, we better ensure there is a minimum number of lines in the grid layout
+        if(current_mode >= Configuration.EXPERT_MODE) {
+          if(argument_count < MINIMUM_ROWS) {
+            argument_count = MINIMUM_ROWS;
+          }
+          pane.setLayout(new GridLayout(argument_count, 1, 5, 5));
+        }
+        // Otherwise we're just going to throw them on one after another and chuck it in a scroll pane anyway
+        else {
+          // use  GridLayout with 0 rows == as many rows as needed. Unfortunately, rows will
+          // grow fat if space too large, but we don't know how many rows we'll need yet.
+          pane.setLayout(new GridLayout(0, 1, 5, 5));
+        }
+      }
+      
+      for(int j = 0; j < schedule_arguments.size(); j++) {
+        pane.add((JComponent)schedule_arguments.get(j));
+      }
+      pane.addMouseListener(this);
+      schedule_arguments = null;
+      return pane;
+
     }
 
@@ -422 +486 @@
             build_options.removeValue(name);
         }
+        else if(type == SCHEDULE) {
+            schedule_options.removeValue(name); 
+        }
         else {
             import_options.removeValue(name);
@@ -430 +497 @@
         if(type == BUILD) {
             build_options.setValue(name, enable, value);
+        }
+        else if(type == SCHEDULE) {
+            schedule_options.setValue(name, enable, value); 
         }
         else {
@@ -523 +593 @@
         case CANCELLED:
             d.append(Dictionary.get("OptionsPane.Cancelled"));
+            break;
+        case SCHEDULED:
+            d.append(Dictionary.get("OptionsPane.Scheduled"));
             break;
         default:

gli/branches/rtl-gli/src/org/greenstone/gatherer/gui/Preferences.java

@@ -731 +731 @@
     public void actionPerformed(ActionEvent event)
     {
+        // Several options requiring restarting the GLI to apply: 
+        // interface font, interface language, changed gliserver url or library url
+        boolean restart_required = false;
+        String restart_message = "";
+
+        
         // Connection preferences
         String program_str = program_field.getText();
@@ -738 +744 @@
         Configuration.setPreviewCommand(program_str);
 
+        String old_library_url = (Configuration.library_url == null) ? null : Configuration.library_url.toString();
         String library_url_string = library_path_field.getText();
+        if(old_library_url != null && !old_library_url.equals(library_url_string)) {
+
+        // If the server is remote and the library path's been changed, then GLI client needs restart
+        // If the server is local, GLI is going to work with the collection of GSDLPath anyway, 
+        // even if the library path for previewing has changed
+        if (Gatherer.isGsdlRemote) {
+            restart_required = true;
+            restart_message = Dictionary.get("Preferences.General.Manual_Restart_Required");
+        }
+        if(Gatherer.c_man.getCollection() != null) {
+            // if the gliserver url has changed while a collection is open, 
+            // close the open collection of the old library URL
+            Gatherer.c_man.saveCollection();
+            Gatherer.c_man.closeCollection();
+            Configuration.setString("general.open_collection"+Configuration.gliPropertyNameSuffix(), true, "");
+        }
+        }
         if (library_url_string.equals("")) {
         Configuration.library_url = null;
@@ -750 +774 @@
         }
         }
-        Configuration.setString("general.library_url", true, library_url_string);
+
+        Configuration.setString("general.library_url"+Configuration.gliPropertyNameSuffix(), 
+                    true, library_url_string);
 
         if (Gatherer.isGsdlRemote && !Gatherer.GS3) {
+        String old_gliserver_url = Configuration.gliserver_url.toString(); 
         String gliserver_url_string = gliserver_url_field.getText();
+        if(!old_gliserver_url.equals(gliserver_url_string)) {
+            restart_required = true;
+            restart_message = Dictionary.get("Preferences.General.Manual_Restart_Required");
+
+            if(Gatherer.c_man.getCollection() != null) {
+            // if the gliserver url has changed while a collection is open, 
+            // close the open collection of the old gliserver URL
+            Gatherer.c_man.saveCollection();
+            Gatherer.c_man.closeCollection();
+            Configuration.setString("general.open_collection"+Configuration.gliPropertyNameSuffix(), true, "");
+            }
+        }
         if (gliserver_url_string.equals("")) {
             Configuration.gliserver_url = null;
@@ -767 +806 @@
         Configuration.setString("general.gliserver_url", true, gliserver_url_string);
         }
+        
 
         boolean site_changed = false;
@@ -777 +817 @@
         Configuration.setSiteAndServlet(new_site, (String)servlet_combobox.getSelectedItem());
         }
-
+       
         Configuration.set("general.use_proxy", true, use_proxy_checkbox.isSelected());
         Configuration.setString("general.proxy_host", true, proxy_host_field.getText());
@@ -788 +828 @@
         Configuration.set("general.view_extracted_metadata", Configuration.COLLECTION_SPECIFIC, view_extracted_metadata_checkbox.isSelected());
 
-        // Two options requiring restarting the GLI to apply: interface font, and interface language
-        boolean restart_required = false;
 
         // GLI interface font
@@ -796 +834 @@
         Configuration.setString("general.font", true, font_field.getText());
         restart_required = true;
+        restart_message = Dictionary.get("Preferences.General.Restart_Required");
         }
 
@@ -803 +842 @@
         Configuration.setLocale("general.locale", Configuration.GENERAL_SETTING, ((DictionaryEntry) language_combobox.getSelectedItem()).getLocale());
         restart_required = true;
+        restart_message = Dictionary.get("Preferences.General.Restart_Required");
         }
 
         // Inform the user that a restart is required, if necessary
         if (restart_required) {
-        JOptionPane.showMessageDialog(Gatherer.g_man, Dictionary.get("Preferences.General.Restart_Required"), Dictionary.get("General.Warning"), JOptionPane.WARNING_MESSAGE);
+        JOptionPane.showMessageDialog(Gatherer.g_man, restart_message, Dictionary.get("General.Warning"), JOptionPane.WARNING_MESSAGE);
         }
 
@@ -845 +885 @@
         if (Gatherer.GS3 && site_changed && Gatherer.c_man.getCollection() != null && !Gatherer.isGsdlRemote) {
         // shut down the collection
-        System.err.println("shutting down teh collection");
+        System.err.println("shutting down the collection");
         Gatherer.g_man.saveThenCloseCurrentCollection();
         }
@@ -867 +907 @@
         Configuration.save();
         if (Gatherer.isGsdlRemote && Gatherer.GS3 && site_changed ){
-        RemoteGreenstoneServer.downloadCollectionConfigurations();
+        Gatherer.remoteGreenstoneServer.downloadCollectionConfigurations();
         }
         // Refresh the GLI to account for the configuration changes
@@ -997 +1037 @@
             if (Gatherer.c_man.getCollection()!=null){
             File lock_file = new File(Gatherer.c_man.getLoadedCollectionDirectoryPath() + "gli.lck");
-            RemoteGreenstoneServer.deleteCollectionFile(Gatherer.c_man.getLoadedCollectionName(),lock_file);
+            Gatherer.remoteGreenstoneServer.deleteCollectionFile(Gatherer.c_man.getLoadedCollectionName(),lock_file);
             Gatherer.g_man.closeCurrentCollection();
             }
             Configuration.site_name=site;
-            RemoteGreenstoneServer.set_remote_greenstone_server_authentication_to_null();
-            RemoteGreenstoneServer.downloadCollectionConfigurations();
+            Gatherer.remoteGreenstoneServer.set_remote_greenstone_server_authentication_to_null();
+            Gatherer.remoteGreenstoneServer.downloadCollectionConfigurations();
         }
         }

gli/branches/rtl-gli/src/org/greenstone/gatherer/gui/PreviewButton.java

@@ -75 +75 @@
     protected void configureHomeURL() {
     // set up the home page for the current collection
-    if (Gatherer.GS3) {
+    if (Gatherer.GS3 && !Configuration.fedora_info.isActive()) { // GLI for GS3 case
         // don't do anything fancy here
         preview_address = Configuration.library_url.toString() + Configuration.getServletPath() + "?a=p&sa=about&c=" + CollectionManager.getLoadedCollectionName() + "&l=" + Configuration.getLanguage();
         return;
     }
+    // FLI or GLI for GS2 case (no library_url)
     preview_address = Configuration.library_url.toString() + "?c=" + CollectionManager.getLoadedCollectionName() + "&l=" + Configuration.getLanguage();
 

gli/branches/rtl-gli/src/org/greenstone/gatherer/gui/SimpleResultDialog.java

@@ -48 +48 @@
 
 public class SimpleResultDialog
-    extends ModalDialog {
+  extends ModalDialog {
     
-    private Dimension size = new Dimension(600,300);
-    private SimpleResultDialog self;
+  private Dimension size = new Dimension(600,300);
+  private SimpleResultDialog self;
     
-    public SimpleResultDialog(String title, String label, String results) {
-    super(Gatherer.g_man, title, true);
-    this.self = this;
+  public SimpleResultDialog(String title, String label, String results) {
+    super(Gatherer.g_man, title, true);
+    this.self = this;
     this.setComponentOrientation(Dictionary.getOrientation());
         
-    setDefaultCloseOperation(DO_NOTHING_ON_CLOSE);
-    setSize(size);
+    setUpGUI(label, results);
+  }
+
+  /** If you are calling this from another dialog, and you want that dialog blocked while this is open, need to use this method, passing in the calling dialog as the parent */
+  public SimpleResultDialog(Dialog parent, String title, String label, String results) {
+
+    super(parent, title, true);
+    this.self = this;
+  
+    setUpGUI(label, results);
+  }
+
+  private void setUpGUI(String label, String results) {
+    setDefaultCloseOperation(DO_NOTHING_ON_CLOSE);
+    setSize(size);
     
-    JPanel content_pane = (JPanel) getContentPane();
-        content_pane.setComponentOrientation(Dictionary.getOrientation());
-    JLabel result_label = new JLabel(label);
-        result_label.setComponentOrientation(Dictionary.getOrientation());
+    JPanel content_pane = (JPanel) getContentPane();
+    content_pane.setComponentOrientation(Dictionary.getOrientation());
+    JLabel result_label = new JLabel(label);
+    result_label.setComponentOrientation(Dictionary.getOrientation());
     
-    JPanel button_pane = new JPanel();
-        button_pane.setComponentOrientation(Dictionary.getOrientation());
-    JButton close_button = new GLIButton(Dictionary.get("General.Close"));
-    close_button.addActionListener(new CloseButtonListener());
+    JPanel button_pane = new JPanel();
+    button_pane.setComponentOrientation(Dictionary.getOrientation());
+    JButton close_button = new GLIButton(Dictionary.get("General.Close"));
+    close_button.addActionListener(new CloseButtonListener());
     
-    JPanel output_pane = new JPanel();
-        output_pane.setComponentOrientation(Dictionary.getOrientation());
-    JLabel output_label = new JLabel(Dictionary.get("General.Review_Output"));
-    output_label.setComponentOrientation(Dictionary.getOrientation());
-    JTextArea output_textarea = new JTextArea(results);
-        output_textarea.setComponentOrientation(Dictionary.getOrientation());
-    output_textarea.setCaretPosition(0);
-    output_textarea.setEditable(false);
-    output_textarea.setLineWrap(true);
-    output_textarea.setWrapStyleWord(true);
+    JPanel output_pane = new JPanel();
+    output_pane.setComponentOrientation(Dictionary.getOrientation());
+    JLabel output_label = new JLabel(Dictionary.get("General.Review_Output"));
+    output_label.setComponentOrientation(Dictionary.getOrientation());
+
+    JTextArea output_textarea = new JTextArea(results);
+    output_textarea.setComponentOrientation(Dictionary.getOrientation());
+    output_textarea.setCaretPosition(0);
+    output_textarea.setEditable(false);
+    output_textarea.setLineWrap(true);
+    output_textarea.setWrapStyleWord(true);
     
-    button_pane.setLayout(new BorderLayout());
-    button_pane.add(close_button, BorderLayout.LINE_END);
+    button_pane.setLayout(new BorderLayout());
+    button_pane.add(close_button, BorderLayout.LINE_END);
     
-    output_pane.setBorder(BorderFactory.createEmptyBorder(5,0,5,0));
-    output_pane.setLayout(new BorderLayout());
-    output_pane.add(output_label, BorderLayout.NORTH);
-    output_pane.add(new JScrollPane(output_textarea), BorderLayout.CENTER);
+    output_pane.setBorder(BorderFactory.createEmptyBorder(5,0,5,0));
+    output_pane.setLayout(new BorderLayout());
+    output_pane.add(output_label, BorderLayout.NORTH);
+    output_pane.add(new JScrollPane(output_textarea), BorderLayout.CENTER);
     
-    content_pane.setBorder(BorderFactory.createEmptyBorder(5,5,5,5));
-    content_pane.setLayout(new BorderLayout());
-    content_pane.add(result_label, BorderLayout.NORTH);
-    content_pane.add(output_pane, 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(result_label, BorderLayout.NORTH);
+    content_pane.add(output_pane, BorderLayout.CENTER);
+    content_pane.add(button_pane, BorderLayout.SOUTH);
     
-    // Position
-    Rectangle frame_bounds = Gatherer.g_man.getBounds();
-    setLocation(frame_bounds.x + (frame_bounds.width - size.width) / 2, frame_bounds.y + (frame_bounds.height - size.height) / 2);
+    // Position
+    Rectangle frame_bounds = Gatherer.g_man.getBounds();
+    setLocation(frame_bounds.x + (frame_bounds.width - size.width) / 2, frame_bounds.y + (frame_bounds.height - size.height) / 2);
+    //new SimpleResultDialog(Gatherer.g_man, title, label, results);
+  }
+  
+  
+  private class CloseButtonListener
+    implements ActionListener {
+    public void actionPerformed(ActionEvent event) {
+      self.setVisible(false);
     }
-    
-    private class CloseButtonListener
-    implements ActionListener {
-    public void actionPerformed(ActionEvent event) {
-        self.setVisible(false);
-    }
-    }
+  }
 }

gli/branches/rtl-gli/src/org/greenstone/gatherer/gui/URLField.java

@@ -4 +4 @@
 import java.net.*;
 import javax.swing.*;
-import org.greenstone.gatherer.Dictionary;
-
-
+import java.util.*;
+import java.io.*;
+import org.greenstone.gatherer.Gatherer;
+import org.greenstone.gatherer.Configuration;
+
+/** Modified. 
+ * Class used by WarningDialog and Gatherer which represents a textual input control 
+ * (TextField or Combobox) into which a URL can be entered. Provides some static methods
+ * shared by these controls and by a general JTextField control which can all be used 
+ * in a WarningDialog. Class URLField also contains an inner Interface class and two 
+ * static inner classes that implement this interface: Text and DropDown. 
+ * Finally, another static inner class URLCollectionPair associates each Gliserver URL
+ * (or Library URL) that can be displayed in the DropDown with the last opened collection
+ * file for the Greenstone server at that URL. 
+*/
 public class URLField
-    extends JTextField
 {
-    public URLField(Color foreground, Color background)
-    {
-    super();
-        this.setComponentOrientation(Dictionary.getOrientation());
-    setBackground(background);
-    setForeground(foreground);
-    }
-
-
-    public boolean validateURL()
-    {
-    String url_string = getText();
+    static public String getText(JComponent control)
+    {
+    if(control instanceof JTextField) { // not specifically a URL Field, therefore, we're not meant to do checking
+        return ((JTextField)control).getText();
+    } 
+    else if(control instanceof URLField.DropDown) {
+        return (String)((JComboBox)control).getSelectedItem();
+    }
+
+    // unknown control, shouldn't happen
+    return "";
+    }
+
+    static public String setText(JComponent control, String text)
+    {
+    if(control instanceof JTextField) { // not specifically a URL Field, therefore, we're not meant to do checking
+        ((JTextField)control).setText(text);
+    } 
+    else if(control instanceof URLField.DropDown) {
+        ((JComboBox)control).setSelectedItem(text);     
+    }
+
+    // unknown control, shouldn't happen
+    return "";
+    }
+
+    static public boolean validateURL(JComponent control)
+    {
+    if(control instanceof URLField.Text) {
+        return ((URLField.Text)control).validateURL();
+    } 
+    else if (control instanceof JTextField) {
+        return true; // not specifically a URL Field, therefore, we're not meant to do checking
+    }
+    else { // control is a DropDown
+        return ((URLField.DropDown)control).validateURL();
+    }
+    }
+
+    static public boolean validateURL(String url_string)
+    {
     if (!url_string.equals("")) {
         // Check the URL string is valid by trying to create a URL object from it
@@ -36 +76 @@
     return true;
     }
+
+    static public void store(JComponent control, String affected_property) {
+    if(control instanceof JTextField) { 
+        String value = ((JTextField)control).getText();
+        Configuration.setString(affected_property, true, value);
+        Configuration.save(); // save it in case of a crash
+    } 
+    else { // DropDown
+        ((DropDown)control).saveProperties(); // saves it already
+    }
+    }
+
+    
+    /** INTERFACE CLASS IMPLEMENTED BY Static inner classes Text and DropDown */
+    public static interface URLFieldControl {
+    public boolean validateURL();
+    }
+
+
+    /** STATIC INNER CLASS URLTextField */
+    public static class Text 
+    extends JTextField implements URLFieldControl 
+    {
+    public Text(Color foreground, Color background)
+    {
+        super();
+         this.setComponentOrientation(Dictionary.getOrientation());
+        setBackground(background);
+        setForeground(foreground);
+    }
+
+    public boolean validateURL() {
+        String url_string = getText();
+        return URLField.validateURL(url_string);
+    }
+    }
+
+   
+    /** STATIC INNER CLASS DropDown, an editable URLComboBox */
+    public static class DropDown 
+    extends JComboBox implements URLFieldControl
+    {
+    private String checkString = null; // optional string to check the URLs items against to see whether the URLs contain this
+    private String affectedProperty = null; // the Configuration property associated with this DropDown
+    private String coaffectedProperty = null; // the Configuration property whose suffix should change along with the affectedProperty
+    
+    private static final int MAX_URLS = 5;
+
+    public DropDown(Color foreground, Color background, String[] defaultURLs, 
+            String affectedProperty, String coaffectedProperty)
+    {
+        super(URLCollectionPair.createDefaultsArray(defaultURLs));
+        this.setEditable(true);
+        this.getEditor().selectAll();
+        this.setComponentOrientation(Dictionary.getOrientation());
+
+        setBackground(background);
+        setForeground(foreground);
+        
+        this.affectedProperty = affectedProperty;
+        this.coaffectedProperty = coaffectedProperty;
+        // read any URLS specified in the config file
+        setComboBoxValues();
+        
+    }
+
+    public DropDown(Color foreground, Color background, String[] defaultURLs, 
+            String affectedProperty, String coaffectedProperty, String checkString)
+    {
+        this(foreground, background, defaultURLs, affectedProperty, coaffectedProperty);
+        this.checkString = checkString;
+    }   
+
+    public boolean validateURL() {
+        //String url_string = (String)this.getEditor().getItem();
+        String url_string = this.getSelectedItem().toString(); // returns url of the combobox item
+        
+        if(checkString != null && !url_string.endsWith(checkString)) {
+        return false;
+        } else {
+        return URLField.validateURL(url_string);
+        }
+    }
+
+    public void saveProperties() {
+        // 1. Add the first url just edited (if any) 
+
+        // The user might have created a new STRING, or selected an existing URLCollectionPair
+        // We don't know the type!
+        Object o = this.getSelectedItem(); 
+        URLCollectionPair editedItem = (o instanceof URLCollectionPair) 
+        ? (URLCollectionPair)o : new URLCollectionPair(o.toString());
+                
+        if(editedItem != null) {
+        insertItemAt(editedItem, 0);
+        } else {
+        editedItem = (URLCollectionPair)getItemAt(0); // else reuse the first default:
+        }
+        Configuration.setString(affectedProperty, true, editedItem.getURL());
+        
+        // concurrently set the last opened collection for this url
+        String lastOpenedCollection = editedItem.getCollection();
+        if(lastOpenedCollection.equals("")) {
+        Configuration.setString(coaffectedProperty, true, null);
+        } else {
+        Configuration.setString(coaffectedProperty, true, lastOpenedCollection);
+        }
+
+
+        // 2. Add the remaining urls into the combobox
+        int url_count = 1; // remain under MAX_URLS AND under the number of actual URLs in the dropdown
+        for(int i = 0; url_count < MAX_URLS && i < getItemCount(); i++, url_count++) {
+        
+        URLCollectionPair item = (URLCollectionPair)getItemAt(i);
+        String url = item.getURL();
+        
+        if(item == null || url.equals(editedItem.getURL()) || url.equals("")) { 
+            // skip any duplicates of the just-edited URL and skip empty URLs
+            url_count--;
+        } 
+        else { 
+            Configuration.setString(affectedProperty+url_count, true, url);
+            
+            // concurrently save the name of the corresponding open collection
+            if(item.getCollection().equals("")) {
+            Configuration.setString(coaffectedProperty+url_count, true, null);
+            } else {
+            Configuration.setString(coaffectedProperty+url_count, true, item.getCollection());
+            }
+
+        } // else retain old value for this affectedProperty (general.gliserver_url)
+        }
+        Configuration.save();
+    }
+
+    
+    // Get values from Configuration file, or (if none) use defaultURLs.
+    // Put them into the combobox
+    private void setComboBoxValues() {
+
+        String url = Configuration.getString(affectedProperty, true);
+        String collection = Configuration.getString(coaffectedProperty, true);
+        boolean finished = url.equals("");
+        if(!finished) {
+        this.removeAllItems(); // remove defaults, since config file now contains init values
+        this.addItem(new URLCollectionPair(url, collection));
+        } // else urls and combobox already contains the defaults
+            
+
+        for(int i = 1; !finished; i++) {
+        url = Configuration.getString(affectedProperty+i, true);
+        collection = Configuration.getString(coaffectedProperty+i, true);
+        if(url.equals("")) {
+            finished = true;
+        }
+        else { // url is not empty
+            this.addItem(new URLCollectionPair(url, collection));
+        }
+        }
+        
+        // setting the size of the dropdown control
+        Dimension newSize=new Dimension(getPreferredSize().width+20, getPreferredSize().height);
+        setPreferredSize(newSize);
+    }
+    }
+
+
+    /** STATIC INNER CLASS URLCollectionPair. 
+     * Since the configuration for a (remote) Greenstone2 and Greenstone3 is now
+     * stored in a single file for both, we can have GLI connecting to different servers 
+     * while for each server, a different collection may have been left open last time.
+     * This class URLCollectionPair will associate a GLIServer_URL or Library_URL with
+     * the last opened collection file for it. It is used by URLField.DropDown combobox. */
+    public static class URLCollectionPair {
+    String url;        // gliserverURL 
+    String collection; // last opened collection for the corresponding gliserver
+
+    
+    public static URLCollectionPair[] createDefaultsArray(String[] defaultURLs) {
+        URLCollectionPair[] pairs = new URLCollectionPair[defaultURLs.length];
+        for(int i = 0; i < pairs.length; i++) {
+        pairs[i] = new URLCollectionPair(defaultURLs[i]); // no associated open collection
+        }
+        return pairs;
+    }
+
+    public URLCollectionPair(String url) {
+        this.set(url, "");
+    }
+
+    public URLCollectionPair(String url, String collection) {
+        this.set(url, collection);
+    }
+
+    public void set(String url, String collection) {
+        this.url = url;
+        this.collection = collection;
+    }
+
+    public void setURL(String url) {
+        this.url = url;
+    }
+
+    public void setCollection(String collection) {
+        this.collection = collection;
+    }
+
+    public String getCollection() {
+        return collection;
+    }
+
+    public String getURL() {
+        return url;
+    }
+
+    /** For display in comboboxes */
+    public String toString() {
+        return url;
+    }
+
+    /** @returns the number that is suffixed to the gliserver_url */
+    public String getSuffixNumber() {
+        String numericSuffix = "";
+        boolean stop = false;
+        for(int index = url.length()-1; index >= 0 && !stop; index--) { // work from the end
+        char character = url.charAt(index);
+        if(Character.isDigit(character)) {
+            numericSuffix = Character.toString(character) + numericSuffix;
+        } else {
+            stop = true;
+        }
+        }
+
+        return numericSuffix;
+    }
+    }
+
 }

gli/branches/rtl-gli/src/org/greenstone/gatherer/gui/WarningDialog.java

@@ -48 +48 @@
     private JButton ok_button;
     private JCheckBox show_check;
-    private JTextField value_field;
+    private JComponent value_field;
     private JPanel value_panel;
     private String affected_property;
     private String full_property;
-
-
-    public WarningDialog(String warning_name, String warning_title, String warning_message, String affected_property, boolean can_cancel)
+    /** Whether or not to display the checkbox that will turn off this dialog in future */
+    private final boolean showcheckbox;
+
+
+    public WarningDialog(String warning_name, String warning_title, String warning_message, String affected_property, boolean can_cancel) 
+    {
+    this(warning_name, warning_title, warning_message, affected_property, can_cancel, true); // true for show checkbox
+    }
+
+
+    public WarningDialog(String warning_name, String warning_title, String warning_message, String affected_property, boolean can_cancel,
+             boolean showcheckbox)
     {
     super(Gatherer.g_man, "Warning", true);
         this.setComponentOrientation(Dictionary.getOrientation());
+    this.showcheckbox = showcheckbox; 
+
     // Determine the name of this prompt.
     this.affected_property = affected_property;
@@ -76 +87 @@
     JPanel text_pane = new JPanel();
         text_pane.setComponentOrientation(Dictionary.getOrientation());
-    JLabel icon_label = new JLabel(JarTools.getImage("gatherer_medium.gif"));
+        
+    String gmedium_image = "gatherer_medium.gif";
+    if (Configuration.fedora_info.isActive()) {
+        gmedium_image = "fli-" + gmedium_image;
+    }
+
+    JLabel icon_label = new JLabel(JarTools.getImage(gmedium_image));
         icon_label.setComponentOrientation(Dictionary.getOrientation());
-        
+
     JTextArea text_area = new JTextArea();
         text_area.setComponentOrientation(Dictionary.getOrientation());
@@ -96 +113 @@
     JPanel bottom_pane = new JPanel();
         bottom_pane.setComponentOrientation(Dictionary.getOrientation());
-    show_check = new JCheckBox(Dictionary.get("WarningDialog.Dont_Show_Again"));
-        show_check.setComponentOrientation(Dictionary.getOrientation());
+        
     JPanel control_pane = new JPanel();
         control_pane.setComponentOrientation(Dictionary.getOrientation());
@@ -139 +155 @@
     bottom_pane.setBorder(BorderFactory.createEmptyBorder(5,0,0,0));
     bottom_pane.setLayout(new BorderLayout());
-    bottom_pane.add(show_check, BorderLayout.CENTER);
     bottom_pane.add(control_pane, BorderLayout.LINE_END);
+    if(showcheckbox) {
+        show_check = new JCheckBox(Dictionary.get("WarningDialog.Dont_Show_Again"));
+        show_check.setComponentOrientation(Dictionary.getOrientation());
+        bottom_pane.add(show_check, BorderLayout.CENTER);
+    }
 
     content_pane.setBorder(BorderFactory.createEmptyBorder(5,5,5,5));
@@ -160 +180 @@
 
     public void actionPerformed(ActionEvent event) {
-    boolean bad_value = false;
+    boolean valid_value = true;
     if(event.getSource() == ok_button) {
         if(affected_property != null && Configuration.self != null) {
-        String value = value_field.getText();
-        if(value.length() > 0) {
-           if(value_field instanceof URLField) {
-              bad_value = !((URLField)value_field).validateURL();
-           }
-           if(!bad_value) {
-              // Store the value of the property
-              Configuration.setString(affected_property, true, value_field.getText());
-           }
+        valid_value = URLField.validateURL(value_field);
+        if(valid_value) {
+            // Store the value of the property
+            URLField.store(value_field, affected_property); //Configuration.setString(affected_property, true, value);
         }
         }
-        if(!bad_value) {
+        if(valid_value) {
         result = JOptionPane.OK_OPTION;
         }
-    }
-    if(!bad_value) {
-        if (Configuration.self != null) {
+    } 
+
+    if(valid_value) {
+        if (Configuration.self != null && showcheckbox) {
         // Store the state of the show message checkbox.
         Configuration.set(full_property, true, !show_check.isSelected());
@@ -202 +218 @@
     }
 
-    public void keyReleased(KeyEvent e) { }
-
-    public void keyTyped(KeyEvent e) { }
+    public void keyReleased(KeyEvent e) {}
+
+    public void keyTyped(KeyEvent e) {}
 
 
@@ -226 +242 @@
      */
     public void setMessageOnly(boolean message_only) {
+    if(!showcheckbox) {
+        return;
+    }
+
     // If this is a message then change the checkbox
     if(message_only) {
@@ -239 +259 @@
      * @param  control the JTextField subclass you want to use for the control
      */
-    public void setValueField(JTextField control) {
+    public void setValueField(JComponent control) {
     // Remove the current control
     value_panel.remove(value_field);
@@ -263 +283 @@
 
     public void setValueField(String field_value){
-    this.value_field.setText(field_value);
+    URLField.setText(this.value_field, field_value);
     }