Changeset 4496 for trunk

Timestamp:

2003-06-06T09:55:23+12:00 (21 years ago)

Author:

jmt12

Message:

2030104: Modified to support SuperCollections needs.

Location:

trunk/gli/src/org/greenstone/gatherer/checklist

Files:

• CheckList.java (modified) (2 diffs)
• Entry.java (modified) (2 diffs)

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

@@ -78 +78 @@
     }
     /** Constructor.
-      * @param list_data An <strong>ArrayList</strong> of entries for this checklist.
-      * @see org.greenstone.gatherer.checklist.CheckList.Entry
-      */
+     * @param list_data An ArrayList of entries for this checklist.
+     * @see org.greenstone.gatherer.checklist.CheckList.Entry
+     */
     public CheckList(ArrayList list_data) {
     super();
@@ -86 +86 @@
     DefaultListModel model = new DefaultListModel();
     for(int i = 0; i < list_data.size(); i++) {
-        Entry entry = new Entry(list_data.get(i));
+        Entry entry = null;
+        Object temp = list_data.get(i);
+        if(temp instanceof Entry) {
+        entry = (Entry) temp;
+        }
+        else {
+        entry = new Entry(list_data.get(i));
+        }
+        temp = null;
         String name = entry.toString();
         int index = 0;

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

@@ -9 +9 @@
 /** An Entry encapsulates a single row of the list, both its check box and the object the row represents. */
 public class Entry
-    extends JCheckBox {
+    extends JCheckBox 
+    implements Comparable {
+
     /** Is this checkboxes state fixed. */
-    private boolean fixed = false;
+    protected boolean fixed = false;
     /** The original object this row is based on, and whose toString() is used to generate the check box label. */
-    private Object object = null;
+    protected Object object = null;
     /** A sundry string for storing original values (rather than strings retrieved from dictionary). */
-    private String property;
+    protected String property;
     /** Constructor. */
     public Entry(Object object) {
@@ -41 +43 @@
     super(text);
     setSelected(is_selected);
+    }
+
+    /** Test this Entry against an Object for ordering. 
+     * @param obj the other Object.
+     * @return <0, 0 or >0 if this Entry is before, equal to or after the given object.
+     */
+    public int compareTo(Object obj) {
+    return toString().toLowerCase().compareTo(obj.toString().toLowerCase());
+    }
+    /** Test this Entry against an Object for equality. 
+     * @param obj the other Object.
+     * @return true if the two are equal, false otherwise.
+     */
+    public boolean equals(Object obj) {
+    return toString().equalsIgnoreCase(obj.toString());
     }