Changeset 9200

Timestamp:

2005-02-25T17:22:07+13:00 (19 years ago)

Author:

mdewsnip

Message:

Changed some function names in CheckList to be more obvious (well, to me, anyway).

Location:

trunk/gli/src/org/greenstone/gatherer

Files:

• cdm/IndexManager.java (modified) (3 diffs)
• cdm/SubcollectionIndexManager.java (modified) (3 diffs)
• gui/ExportCollectionPrompt.java (modified) (1 diff)
• util/CheckList.java (modified) (3 diffs)

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

@@ -744 +744 @@
         source_list.clearSelection();
         ArrayList sources = selected_index.getSources();
-        source_list.setSelectedObjects(sources.toArray());
+        source_list.setTickedObjects(sources.toArray());
         
     }
@@ -758 +758 @@
         }
         // Can't add a new index if no sources are selected
-        else if (source_list.getSelected().size() == 0) {
+        else if (source_list.isNothingTicked()) {
         add_enabled = false;
         }
         // If we get this far, create a dummy index and see if it's already assigned in the collection
         else {
-        Object object[] = source_list.getSelected().toArray();
+        Object object[] = source_list.getTicked().toArray();
         ArrayList sources = new ArrayList();
         for(int i = 0; i < object.length; i++) {
@@ -806 +806 @@
         {
         String name = name_textfield.getText();
-        if (source_list.getSelected().size() > 0 && name.length() != 0) {
-            ArrayList sources = source_list.getSelected();
+        if (!source_list.isNothingTicked() && name.length() != 0) {
+            ArrayList sources = source_list.getTicked();
             Index index = new Index(level_combobox.getSelectedIndex(), sources);
 

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

@@ -409 +409 @@
 
         // Display the selected subcollection index's sources
-        source_list.clearSelection();
-        source_list.setSelectedObjects(selected_index.getSources().toArray());
+        source_list.clearTicked();
+        source_list.setTickedObjects(selected_index.getSources().toArray());
     }
 
@@ -424 +424 @@
         }
         // Can't add a new index if no sources are selected
-        else if (source_list.getSelected().size() == 0) {
+        else if (source_list.isNothingTicked()) {
         add_enabled = false;
         }
         // If we get this far, create a dummy index and see if it's already assigned in the collection
         else {
-        ArrayList sources = source_list.getSelected();
+        ArrayList sources = source_list.getTicked();
         SubcollectionIndex subcollection_index = new SubcollectionIndex(sources.toArray());
 
@@ -468 +468 @@
         {
         String name = subcollection_index_name_textfield.getText();
-        if (source_list.getSelected().size() > 0 && name.length() != 0) {
-            ArrayList sources = source_list.getSelected();
+        if (!source_list.isNothingTicked() && name.length() != 0) {
+            ArrayList sources = source_list.getTicked();
             SubcollectionIndex subcollection_index = new SubcollectionIndex(sources.toArray());
 

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

@@ -448 +448 @@
         ///ystem.err.println("OK Clicked");
         // Make sure there are some colls specified
-        selected_collections = list.getSelected();
+        selected_collections = list.getTicked();
         error_message = new StringBuffer();
         

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

@@ -88 +88 @@
 
 
-    public void clearSelection()
+    public void clearTicked()
     {
     DefaultListModel model = (DefaultListModel) getModel();
@@ -102 +102 @@
      * @see org.greenstone.gatherer.checklist.Entry
      */
-    public ArrayList getSelected()
+    public ArrayList getTicked()
     {
     ArrayList result = new ArrayList();
@@ -148 +148 @@
 
 
-    public void setSelectedObjects(Object objects[])
+    public void setTickedObjects(Object[] objects)
     {
     if (objects == null) {