Changeset 4677

Timestamp:

2003-06-16T11:10:16+12:00 (21 years ago)

Author:

kjdon

Message:

added back in all my changes that Johns cvs didn't recognise and so he consequently clobbered.

File:

• trunk/gli/src/org/greenstone/gatherer/collection/DeleteCollectionPrompt.java (modified) (15 diffs)

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

@@ -43 +43 @@
 import org.greenstone.gatherer.Gatherer;
 import org.greenstone.gatherer.collection.Collection;
+import org.greenstone.gatherer.gui.ModalDialog;
+import org.greenstone.gatherer.gui.SimpleMenuBar;
 import org.greenstone.gatherer.util.ArrayTools;
+import org.greenstone.gatherer.util.GSDLSiteConfig;
 import org.greenstone.gatherer.util.Utility;
 /** This class provides the functionality to delete current collections from the GSDLHOME/collect/ directory. The user chooses the collection from a list, where each entry also displays details about itself, confirms the delete of a collection by checking a checkbox then presses the ok button to actually delete the collection.
@@ -50 +53 @@
  */
 public class DeleteCollectionPrompt
-    extends JDialog {
+    extends ModalDialog {
     /** The currently selected collection for deletion. */
-    private CollectionConfiguration collection = null;
+    private CollectionEntry collection = null;
     /** The model behind the list. */
     private DefaultListModel list_model = null;
@@ -73 +76 @@
     /** A string array used to pass arguments to the phrase retrieval method. */
     private String args[] = null;
+
+    private boolean current_coll_deleted = false;
     /** The size of the delete prompt screen. */
     public static final Dimension SIZE = new Dimension(500, 500);
@@ -82 +87 @@
      */
     public DeleteCollectionPrompt() {
-    super();
+    super(Gatherer.g_man);
     this.close_button = new JButton(get("General.Close", null));
     this.confirmation = new JCheckBox(get("Confirm_Delete", null));
@@ -95 +100 @@
     this.setSize(SIZE);
     this.setTitle(get("Title", null));
+    this.setJMenuBar(new SimpleMenuBar("0")); // need to find an appropriate help page to open at
     close_button.addActionListener(new CloseButtonListener());
     confirmation.addActionListener(new ConfirmationCheckBoxListener());
@@ -121 +127 @@
     prompt = null;
     }
-    /** This method causes the modal prompt to be displayed. */
-    public void display() {
+    /** This method causes the modal prompt to be displayed. 
+     * returns true if it has deleted the collection that is currently open*/
+    public boolean display() {
     // Central pane
     JPanel list_pane = new JPanel(new BorderLayout());
@@ -163 +170 @@
     Dimension screen_size = Gatherer.config.screen_size;
     this.setLocation((screen_size.width - SIZE.width) / 2, (screen_size.height - SIZE.height) / 2);
-    this.show();
-    }
-
-    /** Shows a delete complete prompt.
+    this.setVisible(true); // blocks until the dialog is killed
+    return current_coll_deleted;
+    
+    }
+    /** Shows a delete complete prompt. 
       * @param success A <strong>boolean</strong> indicating if the collection was successfully deleted.
       * @see org.greenstone.gatherer.collection.Collection
@@ -180 +188 @@
     }
     }
-
     /** Retrieves a phrase from the <strong>Dictionary</strong> in <strong>Gatherer</strong>.
       * @param key A <strong>String</strong> used to match against a specific phrase in the dictionary.
@@ -204 +211 @@
     File collect_directory = new File(collect_directory_name);
     if(collect_directory.exists()) {
-        // Now for each child directory see if it contains a .col file and if so try to load it..
+        // Now for each child directory see if it contains a .col file and
+        // if so try to load it..
         File collections[] = collect_directory.listFiles();
         ArrayTools.sort(collections);
         for(int i = 0; collections != null && i < collections.length; i++) {
-        File children[] = collections[i].listFiles();
-        for(int j = 0; children != null && j < children.length; j++) {
-            if(children[j].getAbsolutePath().endsWith(".col")) {
-            list_model.addElement(new CollectionConfiguration(children[j]));
-            }
+        File config_file = Utility.findConfigFile(collections[i]);
+        if (config_file != null) {
+            CollectionConfiguration config = new CollectionConfiguration(config_file);
+            if (config != null) {
+            CollectionEntry col = new CollectionEntry(collections[i].getName(), config);
+            list_model.addElement(col);
+            }    
         }
         }
@@ -219 +229 @@
     }
     /** A button listener implementation, which listens for actions on the close button and disposes of the dialog when detected. */
-    private class CloseButtonListener
+    private class CloseButtonListener 
     implements ActionListener {
     /** Any implementation of ActionListener must include this method so we can be informed when the button is actioned.
@@ -230 +240 @@
     /** This private class listens for selection events in from the list and then displays the appropriate details for that collection.
       */
-    private class CollectionListListener
+    private class CollectionListListener 
     implements ListSelectionListener {
     /** Any implementation of ListSelectionListener must include this method so we can be informed when the list selection changes.
@@ -238 +248 @@
         if(!list.isSelectionEmpty()) {
         confirmation.setEnabled(true);
-        collection = (CollectionConfiguration) list.getSelectedValue();
-        args = new String[5];
-        args[0] = collection.getName();
-        args[1] = collection.getShortName();
+        collection = (CollectionEntry) list.getSelectedValue();
+        args = new String[4];
+        args[0] = collection.getTitle();
+        args[1] = collection.getName();
         args[2] = collection.getCreator();
         args[3] = collection.getMaintainer();
         args[4] = collection.getDescription();
         details.setText(get("Details", args));
+        details.setCaretPosition(0);
         }
         else {
@@ -267 +278 @@
         }
     }
-    }
+    }         
     /** The OK button listener implementation. */
-    private class OKButtonListener
+    private class OKButtonListener 
     implements ActionListener {
     /** Any implementation of ActionListener must include this method so we can be informed when the button is actioned.
@@ -278 +289 @@
      */
     public void actionPerformed(ActionEvent event) {
-                // Delete the selected collection.
-        File delete_me = collection.getFile().getParentFile().getParentFile();
+        // Delete the selected collection.
+
+        // first of all we must release it from the local library
+        if(Gatherer.config.exec_file != null) {
+        ///ystem.err.println("Local Library Found!");
+        Gatherer.g_man.preview_pane.configServer(GSDLSiteConfig.RELEASE_COMMAND + collection.getName());
+        }
+
+        File delete_me = new File(Utility.getCollectionDir(Gatherer.config.gsdl_path) + collection.getName() + File.separator);
         if(Utility.delete(delete_me)) {
+        if (Gatherer.c_man.getCollection()!=null && collection.getName().equals(Gatherer.c_man.getCollection().getName())) {
+            current_coll_deleted = true;
+        }
+
         resultPrompt(true);
         list_model.removeElement(collection);
@@ -294 +316 @@
     }
     }
+
+    private class CollectionEntry {
+
+    private String name = null;
+    private CollectionConfiguration config = null;
+
+    public CollectionEntry(String name, CollectionConfiguration config) {
+        this.name = name;
+        this.config = config;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public String getTitle() {
+        return config.getName();
+    }
+
+    public String getCreator() {
+        return config.getCreator();
+    }
+
+    public String getDescription() {
+        return config.getDescription();
+    }
+    
+    public String getMaintainer() {
+        return config.getMaintainer();
+    }
+    public String toString() {
+        return config.getName();
+        
+    }
+    }
 }