Changeset 8590

Timestamp:

2004-11-18T09:55:22+13:00 (19 years ago)

Author:

mdewsnip

Message:

Renamed checklist/Entry.java to checklist/CheckListEntry.java.

Location:

trunk/gli/src/org/greenstone/gatherer

Files:

• cdm/SuperCollectionManager.java (modified) (3 diffs)
• checklist/CheckList.java (modified) (9 diffs)
• checklist/CheckListEntry.java (added)
• checklist/Entry.java (deleted)
• collection/ExportCollectionPrompt.java (modified) (2 diffs)
• gems/GEMSPreferences.java (modified) (1 diff)
• gui/CreatePane.java (modified) (1 diff)
• gui/Preferences.java (modified) (3 diffs)

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

@@ -37 +37 @@
 import org.greenstone.gatherer.Gatherer;
 import org.greenstone.gatherer.checklist.CheckList;
-import org.greenstone.gatherer.checklist.Entry;
+import org.greenstone.gatherer.checklist.CheckListEntry;
 import org.greenstone.gatherer.collection.BasicCollectionConfiguration;
 import org.greenstone.gatherer.util.StaticStrings;
@@ -163 +163 @@
         int size = collection_checklist_model.size();
         for(int i = 0; i < size; i++) {
-        Entry entry = (Entry) collection_checklist_model.get(i);
+        CheckListEntry entry = (CheckListEntry) collection_checklist_model.get(i);
         if(entry.isSelected()) {
             String collection_name = (String) entry.getProperty();
@@ -224 +224 @@
 
             // The current collection is always selected.
-            Entry entry = new Entry(collection_title);
+            CheckListEntry entry = new CheckListEntry(collection_title);
             entry.setProperty(collection_name);
             entry.setSelected(getSuperCollection(collection_name) != null || collection_name.equals(current_coll_name));

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

@@ -63 +63 @@
     this.show_selected_row = show_selected_row;
 
-    setCellRenderer(new CellRenderer());
+    setCellRenderer(new CheckListCellRenderer());
     setModel(new DefaultListModel());
     setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
@@ -70 +70 @@
 
 
-    public void addEntry(Entry entry)
+    public void addEntry(CheckListEntry entry)
     {
     DefaultListModel model = (DefaultListModel) getModel();
@@ -92 +92 @@
     DefaultListModel model = (DefaultListModel) getModel();
     for (int i = 0; i < model.size(); i++) {
-        ((Entry) model.get(i)).setSelected(false);
+        ((CheckListEntry) model.get(i)).setSelected(false);
     }
     updateUI();
@@ -107 +107 @@
     DefaultListModel model = (DefaultListModel) getModel();
     for (int i = 0; i < model.size(); i++) {
-        Entry entry = (Entry) model.get(i);
+        CheckListEntry entry = (CheckListEntry) model.get(i);
         if (entry.isSelected()) {
         result.add(entry.getObject());
@@ -114 +114 @@
     return result;
     }
-
-
-//     public boolean isSelectionEmpty()
-//     {
-//  System.err.println("In CheckList.isSelectionEmpty()...");
-//  DefaultListModel model = (DefaultListModel) getModel();
-//  for (int i = 0; i < model.size(); i++) {
-//      Entry entry = (Entry) model.get(i);
-//      if (entry.isSelected()) {
-//      return false;
-//      }
-//  }
-
-//  return true;
-//     }
 
 
@@ -139 +124 @@
     for (int i = 0; i < list_data.size(); i++) {
         Object list_object = list_data.get(i);
-        if (list_object instanceof Entry) {
-        addEntry((Entry) list_object);
+        if (list_object instanceof CheckListEntry) {
+        addEntry((CheckListEntry) list_object);
         }
         else {
-        addEntry(new Entry(list_object));
+        addEntry(new CheckListEntry(list_object));
         }
     }
@@ -157 +142 @@
     DefaultListModel model = (DefaultListModel) getModel();
     for (int i = 0; i < model.size(); i++) {
-        Entry entry = (Entry) model.get(i);
+        CheckListEntry entry = (CheckListEntry) model.get(i);
         for (int j = 0; j < objects.length; j++) {
         if (entry.getObject().equals(objects[j])) {
@@ -174 +159 @@
 
     /** A custom list cell renderer for producing rows which contain clickable check boxes. */
-    protected class CellRenderer 
+    protected class CheckListCellRenderer 
     implements ListCellRenderer {
 
@@ -216 +201 @@
         JList list = (JList) e.getSource();
         int index = list.locationToIndex(e.getPoint());
-        Entry checkbox = (Entry)list.getModel().getElementAt(index);
+        CheckListEntry checkbox = (CheckListEntry)list.getModel().getElementAt(index);
         if(!checkbox.isFixed()) {
         checkbox.setSelected(!checkbox.isSelected());

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

@@ -48 +48 @@
 import org.greenstone.gatherer.Gatherer;
 import org.greenstone.gatherer.checklist.CheckList;
-import org.greenstone.gatherer.checklist.Entry;
+import org.greenstone.gatherer.checklist.CheckListEntry;
 import org.greenstone.gatherer.gui.GLIButton;
 import org.greenstone.gatherer.gui.ModalDialog;
@@ -419 +419 @@
         ok_button.setEnabled(false);
         if(!list.isSelectionEmpty()) {
-        collection = (BasicCollectionConfiguration) ((Entry)list.getSelectedValue()).getObject();
+        collection = (BasicCollectionConfiguration) ((CheckListEntry)list.getSelectedValue()).getObject();
         args = new String[5];
         args[0] = collection.getName();

trunk/gli/src/org/greenstone/gatherer/gems/GEMSPreferences.java

@@ -42 +42 @@
 import org.greenstone.gatherer.cdm.PlugInManager;
 import org.greenstone.gatherer.checklist.CheckList;
-import org.greenstone.gatherer.checklist.Entry;
 import org.greenstone.gatherer.collection.Collection;
 import org.greenstone.gatherer.gui.tree.DragTree;

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

@@ -61 +61 @@
 
 /** 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>
- * <center><table width=80% border=2 cellspacing=0 cellpadding=2><tr><td align=center colspan=4>
- * The (i)mport and/or (b)uild options supported:</td></tr>
- * <tr background=black><font color=white><td>Script</td><td>Associated Argument</td><td>Control</td><td>Comments</td></font></tr>
- * <tr><td>b</td><td>-allclassifications</td><td>JCheckBox</td><td>&nbsp;</td></tr>
- * <tr><td>i/b</td><td>-archivedir</td><td>JTextField</td><td>&nbsp;</td></tr>
- * <tr><td>b</td><td>-builddir</td><td>JTextField</td><td>&nbsp;</td></tr>
- * <tr><td>i/b</td><td>-debug</td><td>JCheckBox</td><td>&nbsp;</td></tr>
- * <tr><td>i/b</td><td>-collectdir</td><td>JTextField</td><td>&nbsp;</td></tr>
- * <tr><td>b</td><td>-create_images</td><td>JCheckBox</td><td>&nbsp;</td></tr>
- * <tr><td>i</td><td>-groupsize</td><td>JSpinner </td><td>&nbsp;</td></tr>
- * <tr><td>i</td><td>-gzip</td><td>JCheckBox</td><td>&nbsp;</td></tr>
- * <tr><td>i</td><td>-importdir</td><td>JTextField</td><td>&nbsp;</td></tr>
- * <tr><td>b</td><td>-index</td><td>GCheckList</td><td>&nbsp;</td></tr>
- * <tr><td>i/b</td><td>-keepold</td><td>JCheckBox</td><td>sanity check removeold</td></tr>
- * <tr><td>i/b</td><td>-maxdocs</td><td>JSpinner</td><td>&nbsp;</td></tr>
- * <tr><td>b</td><td>-mode</td><td>JComboBox</td><td>"all", "compress_text", "infodb", "build_index"</td></tr>
- * <tr><td>b</td><td>-no_text</td><td>JCheckBox</td><td>&nbsp;</td></tr>
- * <tr><td>i</td><td>-OIDtype</td><td>JComboBox</td><td>"hash","incremental"</td></tr>
- * <tr><td>i/b</td><td>-out</td><td>JTextField</td><td>&nbsp;</td></tr>
- * <tr><td>i</td><td>-removeold</td><td>JCheckBox</td><td>sanity check keepold</td></tr>
- * <tr><td>i</td><td>-sortmeta</td><td>JComboBox</td><td>&nbsp;</td></tr>
- * <tr><td>i/b</td><td>-verbosity</td><td>JSpinner</td><td>1, 3</td></tr>
- * </table></center>
  * @author John Thompson, Greenstone Digital Library, University of Waikato
  * @version 2.3

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

@@ -41 +41 @@
 import org.greenstone.gatherer.cdm.PlugInManager;
 import org.greenstone.gatherer.checklist.CheckList;
-import org.greenstone.gatherer.checklist.Entry;
+import org.greenstone.gatherer.checklist.CheckListEntry;
 import org.greenstone.gatherer.collection.Collection;
 import org.greenstone.gatherer.gui.tree.DragTree;
@@ -496 +496 @@
         // Remove 'warning.'
         String title = Dictionary.get(property.substring(8) + ".Title");
-        Entry entry = new Entry(title, value.equalsIgnoreCase(TRUE));
+        CheckListEntry entry = new CheckListEntry(title, value.equalsIgnoreCase(TRUE));
         entry.setProperty(property);
         warning_preferences_check_list.addEntry(entry);
@@ -683 +683 @@
         ListModel warning_preferences_check_list_model = warning_preferences_check_list.getModel();
         for (int i = 0; i < warning_preferences_check_list_model.getSize(); i++) {
-        Entry entry = (Entry) warning_preferences_check_list_model.getElementAt(i);
+        CheckListEntry entry = (CheckListEntry) warning_preferences_check_list_model.getElementAt(i);
         Configuration.set(entry.getProperty(), true, entry.isSelected());
         }