Changeset 7662

Timestamp:

2004-06-29T15:03:46+12:00 (20 years ago)

Author:

kjdon

Message:

lots of changes. url field is now just a plain textfield. does no validation of url. interface redesigned slightly. clear cache button now here.

File:

• trunk/gli/src/org/greenstone/gatherer/gui/MirrorPane.java (modified) (15 diffs)

trunk/gli/src/org/greenstone/gatherer/gui/MirrorPane.java

@@ -46 +46 @@
 import javax.swing.event.*;
 import javax.swing.tree.*;
+import org.greenstone.gatherer.Configuration;
 import org.greenstone.gatherer.Dictionary;
 import org.greenstone.gatherer.Gatherer;
@@ -53 +54 @@
 import org.greenstone.gatherer.gui.Preferences;
 import org.greenstone.gatherer.gui.URLField;
+import org.greenstone.gatherer.gui.tree.WorkspaceTree;
 import org.greenstone.gatherer.util.StaticStrings;
 import org.greenstone.gatherer.util.Utility;
@@ -63 +65 @@
     extends JPanel {
 
+    /** The threshold for when the advanced options get added */
+    static private final int THRESHOLD = Configuration.SYSTEMS_MODE;
+
     private boolean download_button_enabled = false;
     private boolean ready = false;
+    private int current_mode;
+    private JButton clear_cache_button;
     private JButton download_button;
     private JCheckBox higher_checkbox;
@@ -71 +78 @@
     private JScrollPane list_scroll;
     private JComboBox depth_combobox;
-    private URLField url_field;
+    //private URLField url_field;
+    private JPanel options_pane;
+    private JTextField url_field;
     private Vector depth_model;
     private WGet getter;
@@ -81 +90 @@
         getter.start();
     // And retrieve its list of pending jobs
-    list_scroll = getter.getJobList();
-
+    list_scroll = getter.getDownloadJobList();
+
+    current_mode = Gatherer.config.getMode();
+    String user_dir = System.getProperty("user.dir");
+    System.err.println("user dir = "+user_dir);
     // Create
     JPanel edit_pane = new JPanel();
     JPanel details_pane = new JPanel();
+    options_pane = new JPanel();
 
     JPanel url_pane = new JPanel();
     JLabel url_label = new JLabel();
     Dictionary.registerText(url_label, "Mirroring.Source_URL");
-    url_field = new URLField(Gatherer.config.getColor("coloring.editable_foreground", false), Gatherer.config.getColor("coloring.editable_background", false), Gatherer.config.getColor("coloring.error_foreground", false), Gatherer.config.getColor("coloring.error_background", false));
+    url_field = new JTextField();
     Dictionary.registerTooltip(url_field, "Mirroring.Source_URL_Tooltip");
 
     depth_model = new Vector();
-    /* @todo - add to dictionary */
-    depth_model.add(new DepthEntry(0, "Mirroring.Download_Depth.Zero"));
+    depth_model.add(new DepthEntry(0, Dictionary.get("Mirroring.Download_Depth.Zero")));
     /* @todo - add to dictionary */
     depth_model.add(new DepthEntry(1, String.valueOf(1)));
     /* @todo - add to dictionary */
-    depth_model.add(new DepthEntry(2, String.valueOf(3)));
+    depth_model.add(new DepthEntry(2, String.valueOf(2)));
     /* @todo - add to dictionary */
     depth_model.add(new DepthEntry(3, String.valueOf(3)));
@@ -106 +118 @@
     /* @todo - add to dictionary */
     depth_model.add(new DepthEntry(5, String.valueOf(5)));
-    /* @todo - add to dictionary */
-    depth_model.add(new DepthEntry(-1, "Mirroring.Download_Depth.Unlimited"));
+    depth_model.add(new DepthEntry(-1, Dictionary.get("Mirroring.Download_Depth.Unlimited")));
     JPanel depth_pane = new JPanel();
     JLabel depth_label = new JLabel();
@@ -115 +126 @@
 
     requisite_checkbox = new JCheckBox();
-    Dictionary.registerText(requisite_checkbox, "Mirroring.Download_Hidden");
+    Dictionary.registerText(requisite_checkbox, "Mirroring.Download_Embedded");
+    
 
     higher_checkbox = new JCheckBox();
     Dictionary.registerText(higher_checkbox, "Mirroring.Higher_Directories");
-
+    higher_checkbox.addActionListener(new CheckboxClickListener());
+    
     same_host_checkbox = new JCheckBox();
     same_host_checkbox.setSelected(true);
@@ -126 +139 @@
     JPanel button_pane = new JPanel();
 
-    JButton preferences_button = new GLIButton("Mirroring.Further_Options");
+    JButton preferences_button = new GLIButton();
+    preferences_button.setEnabled(true);
     preferences_button.setMnemonic(KeyEvent.VK_P);
+    Dictionary.registerBoth(preferences_button, "Mirroring.Preferences", "Mirroring.Preferences_Tooltip");
+    
+    clear_cache_button = new GLIButton();
+    clear_cache_button.setEnabled(true);
+    clear_cache_button.setMnemonic(KeyEvent.VK_C);
+    Dictionary.registerBoth(clear_cache_button, "Mirroring.ClearCache", "Mirroring.ClearCache_Tooltip");
 
     download_button = new GLIButton();
-    download_button.setEnabled(false);
+    download_button.setEnabled(true);
     download_button.setMnemonic(KeyEvent.VK_D);
     Dictionary.registerBoth(download_button, "Mirroring.Download", "Mirroring.Download_Tooltip");
-
     // Connect
+    clear_cache_button.addActionListener(new ClearCacheListener());
     download_button.addActionListener(new DownloadButtonListener());
     preferences_button.addActionListener(new PreferencesButtonActionListener());
-    url_field.getDocument().addDocumentListener(new DownloadButtonEnabler());
 
     // Layout
@@ -149 +168 @@
     depth_pane.add(depth_combobox);
 
-    details_pane.setLayout(new GridLayout(5,1,0,5));
+    details_pane.setLayout(new GridLayout(2,1,0,5));
+    details_pane.setBorder(BorderFactory.createEmptyBorder(2,2,5,2));
     details_pane.add(url_pane);
     details_pane.add(depth_pane);
-    details_pane.add(requisite_checkbox);
-    details_pane.add(higher_checkbox);
-    details_pane.add(same_host_checkbox);
-
-    button_pane.setLayout(new GridLayout(1,3));
+
+    options_pane.setLayout(new GridLayout(3,1,0,5));
+    
+    options_pane.add(higher_checkbox);
+    options_pane.add(same_host_checkbox);
+    if (current_mode >= THRESHOLD) {
+        options_pane.add(requisite_checkbox);
+    }
+
+    button_pane.setLayout(new GridLayout(3,1));
     button_pane.add(preferences_button);
-    button_pane.add(new JPanel());
+    button_pane.add(clear_cache_button);
     button_pane.add(download_button);
 
     edit_pane.setBorder(BorderFactory.createCompoundBorder(BorderFactory.createEmptyBorder(2,0,0,0), BorderFactory.createCompoundBorder(BorderFactory.createTitledBorder(Dictionary.get("Mirroring.Download_Controls")), BorderFactory.createEmptyBorder(2,2,2,2))));
     edit_pane.setLayout(new BorderLayout());
-    edit_pane.add(details_pane, BorderLayout.CENTER);
-    edit_pane.add(button_pane, BorderLayout.SOUTH);
+    edit_pane.add(details_pane, BorderLayout.NORTH);
+    edit_pane.add(button_pane, BorderLayout.EAST);
+    edit_pane.add(options_pane, BorderLayout.CENTER);
 
     setBorder(BorderFactory.createEmptyBorder(5,5,5,5));
@@ -191 +217 @@
         download_button_enabled = false;
         // And we tell the user why.
-        /** @todo - add to dictionary */
-        JOptionPane.showMessageDialog(Gatherer.g_man, "Mirroring.No_WGet", "Mirroring.No_WGet_Title", JOptionPane.ERROR_MESSAGE);
+        Gatherer.missingWGET();
     }
     else if(wget_version_str.equals(StaticStrings.WGET_OLD_STR)) {
@@ -198 +223 @@
         download_button_enabled = true;
         // But we display a preventable warning message about the path problems.
-        WarningDialog dialog = new WarningDialog("warning.OldWGet", false);
-        dialog.display();
-        dialog.dispose();
-        dialog = null;
+        Gatherer.oldWGET();
     }
     // Otherwise version must be ok
@@ -208 +230 @@
     }
     // It is also a good time to determine if the download should be enabled - ie if its allowed to be enabled and a valid URL is present in the field.
-    download_button.setEnabled(download_button_enabled && !url_field.isEmpty() && url_field.validateURL());
-    }
-
-//      public void setURL(String url) {
-//      url_field.setText(url);
-//      }
-
-
-//      static public FileNode getWebCacheMapping()
-//      {
-//      if (Gatherer.config.get("workflow.mirror", true) || Gatherer.config.get("workflow.mirror", false)) {
-//          /* @todo - add to dictionary */
-//          return new FileNode(Utility.getCacheDir(), "Mirroring.Mirror_Cache");
-//      }
-//      return null;
-//      }
+    download_button.setEnabled(download_button_enabled);
+    }
+
+    public void modeChanged(int mode) {
+    int old_mode = current_mode;
+    current_mode = mode;
+    if (old_mode >= THRESHOLD && current_mode >= THRESHOLD) {
+        return;
+    }
+    if (old_mode < THRESHOLD && current_mode < THRESHOLD) {
+        return;
+    }
+    if (current_mode >= THRESHOLD) {
+        options_pane.add(requisite_checkbox);
+    } else {
+        options_pane.remove(requisite_checkbox);
+        requisite_checkbox.setSelected(false);
+    }
+    
+    }
+
 
     /** A DepthEntry contains a depth value, as an int, and a representitive text string. This allows for a more meaningful appearance than '0' for instance. */
@@ -278 +305 @@
     }
 
-    private class DownloadButtonEnabler
-    implements DocumentListener {
-    /** Gives notification that an attribute or set of attributes changed. */
-    public void changedUpdate(DocumentEvent e) {
-        validateDownloadButton();
-    }
-        /** Gives notification that there was an insert into the document. */
-    public void insertUpdate(DocumentEvent e) {
-        validateDownloadButton();
-    }
-        /** Gives notification that a portion of the document has been removed. */
-    public void removeUpdate(DocumentEvent e) {
-        validateDownloadButton();
-    } 
-    private void validateDownloadButton() {
-        download_button.setEnabled(download_button_enabled && !url_field.isEmpty() && url_field.validateURL());
-    }
-    }
-
+    private class ClearCacheListener
+    implements ActionListener {
+    public void actionPerformed(ActionEvent event) {
+        // Retrieve the cache folder and delete it.
+        Utility.delete(Utility.getCacheDir());
+        // ...and refresh the node in the workspace tree to show it's all gone
+        Gatherer.g_man.refreshWorkspaceTree(WorkspaceTree.DOWNLOADED_FILES_CHANGED);
+    }
+    }
+
+    private class CheckboxClickListener
+    implements ActionListener {
+    public void actionPerformed(ActionEvent event) {
+        if (higher_checkbox.isSelected()) {
+        same_host_checkbox.setEnabled(false);
+        } else {
+        same_host_checkbox.setEnabled(true);
+        }
+    }
+    }
+    
     private class DownloadButtonListener
     implements ActionListener {
@@ -350 +379 @@
 
         if(url != null) {
-        getter.newJob(!higher_checkbox.isSelected(), !same_host_checkbox.isSelected(), requisite_checkbox.isSelected(), url, depth_value, destination_filename);
+        getter.newDownloadJob(higher_checkbox.isSelected(), (higher_checkbox.isSelected()? false : !same_host_checkbox.isSelected()), !requisite_checkbox.isSelected(), url, depth_value, destination_filename);
         }
     }
@@ -361 +390 @@
     }
     }
+
+
 }