Changeset 9249

Timestamp:

2005-03-02T10:30:29+13:00 (19 years ago)

Author:

mdewsnip

Message:

Fixed up CheckList selection (again), and changed WriteCDImagePrompt to only enabled the OK button when something is ticked (again), and the same for the ExportAsPrompt.

Location:

trunk/gli/src/org/greenstone/gatherer

Files:

• gui/ExportAsPrompt.java (modified) (1 diff)
• gui/WriteCDImagePrompt.java (modified) (1 diff)
• util/CheckList.java (modified) (1 diff)

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

@@ -471 +471 @@
      */
     private class CollectionListListener 
-    implements ListSelectionListener {
+    implements ListSelectionListener
+    {
     /** Any implementation of ListSelectionListener must include this method so we can be informed when the list selection changes.
      * @param  event a <strong>ListSelectionEvent</strong> containing all the relevant information garnered from the event itself
      */
-    public void valueChanged(ListSelectionEvent event) {
-        ok_button.setEnabled(false);
-        if(!list.isSelectionEmpty()) {
-        collection = (BasicCollectionConfiguration) ((CheckListEntry)list.getSelectedValue()).getObject();
-        args = new String[3];
-        args[0] = collection.getCreator();
-        args[1] = collection.getMaintainer();
-        args[2] = collection.getDescription();
-        Dictionary.setText(details_textarea, "DeleteCollectionPrompt.Details", args);
-        details_textarea.setCaretPosition(0);
-        ok_button.setEnabled(true);
+    public void valueChanged(ListSelectionEvent event)
+    {
+        // Can only export when something is ticked
+        ok_button.setEnabled(!list.isNothingTicked());
+
+        if (list.isSelectionEmpty()) {
+        // This only happens when the dialog is first entered
+        Dictionary.setText(details_textarea, "DeleteCollectionPrompt.No_Collection");
+        return;
         }
-        else {
-        Dictionary.setText(details_textarea, "DeleteCollectionPrompt.No_Collection");
-        ok_button.setEnabled(false);
-        }
-    }
-    }
-    
-   /** The OK button listener implementation. */
+
+        collection = (BasicCollectionConfiguration) ((CheckListEntry) list.getSelectedValue()).getObject();
+        args = new String[3];
+        args[0] = collection.getCreator();
+        args[1] = collection.getMaintainer();
+        args[2] = collection.getDescription();
+        Dictionary.setText(details_textarea, "DeleteCollectionPrompt.Details", args);
+        details_textarea.setCaretPosition(0);
+    }
+    }
+
+
+    /** The OK button listener implementation. */
     private class OKButtonListener 
     implements ActionListener {

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

@@ -402 +402 @@
     }
 
+
     /** This private class listens for selection events in from the list and then displays the appropriate details for that collection.
      */
     private class CollectionListListener 
-    implements ListSelectionListener {
+    implements ListSelectionListener
+    {
     /** Any implementation of ListSelectionListener must include this method so we can be informed when the list selection changes.
      * @param  event a <strong>ListSelectionEvent</strong> containing all the relevant information garnered from the event itself
      */
-    public void valueChanged(ListSelectionEvent event) {
-        ok_button.setEnabled(false);
-        if(!list.isSelectionEmpty()) {
-        collection = (BasicCollectionConfiguration) ((CheckListEntry)list.getSelectedValue()).getObject();
-        args = new String[3];
-        args[0] = collection.getCreator();
-        args[1] = collection.getMaintainer();
-        args[2] = collection.getDescription();
-        Dictionary.setText(details_textarea, "DeleteCollectionPrompt.Details", args);
-        details_textarea.setCaretPosition(0);
-        ok_button.setEnabled(true);
+    public void valueChanged(ListSelectionEvent event)
+    {
+        // Can only export when something is ticked
+        ok_button.setEnabled(!list.isNothingTicked());
+
+        if (list.isSelectionEmpty()) {
+        // This only happens when the dialog is first entered
+        Dictionary.setText(details_textarea, "DeleteCollectionPrompt.No_Collection");
+        return;
         }
-        else {
-        Dictionary.setText(details_textarea, "DeleteCollectionPrompt.No_Collection");
-        ok_button.setEnabled(false);
-        }
-    }
-    }
-    
-   /** The OK button listener implementation. */
+
+        collection = (BasicCollectionConfiguration) ((CheckListEntry) list.getSelectedValue()).getObject();
+        args = new String[3];
+        args[0] = collection.getCreator();
+        args[1] = collection.getMaintainer();
+        args[2] = collection.getDescription();
+        Dictionary.setText(details_textarea, "DeleteCollectionPrompt.Details", args);
+        details_textarea.setCaretPosition(0);
+    }
+    }
+
+
+    /** The OK button listener implementation. */
     private class OKButtonListener 
     implements ActionListener {

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

@@ -217 +217 @@
         checkbox.grabFocus();
 
-        // This is necessary to get the checkbox to repaint in Java 1.5.0
-        list.getSelectionModel().clearSelection();
+        // We need to cause a ListSelectionEvent -- this is ugly but I can't find a better way quickly
+        list.removeSelectionInterval(0, 0);
+        list.setSelectionInterval(index, index);
     }
     }