Changeset 8262

Timestamp:

2004-10-08T16:54:49+13:00 (20 years ago)

Author:

mdewsnip

Message:

Removed the FileNode functions from ArrayTools as this creates nasty dependencies.

Location:

trunk/gli/src/org/greenstone/gatherer

Files:

• gui/EnrichPane.java (modified) (2 diffs)
• gui/table/GTableModel.java (modified) (2 diffs)
• util/ArrayTools.java (modified) (2 diffs)

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

@@ -58 +58 @@
 import org.greenstone.gatherer.msm.MSMEvent;
 import org.greenstone.gatherer.msm.MSMListener;
-import org.greenstone.gatherer.util.ArrayTools;
 import org.greenstone.gatherer.util.Codec;
 import org.greenstone.gatherer.util.DragGroup;
@@ -759 +758 @@
         records = null;
         TreePath paths[] = collection_tree.getSelectionPaths();
+        records = new FileNode[paths.length];
         for (int i = 0; i < paths.length; i++) {
         FileNode record = (FileNode) paths[i].getLastPathComponent();
-        records = ArrayTools.add(records, record);
+        records[i] = record;
         }
 

trunk/gli/src/org/greenstone/gatherer/gui/table/GTableModel.java

@@ -44 +44 @@
 import org.greenstone.gatherer.msm.MSMListener;
 import org.greenstone.gatherer.msm.MSMUtils;
-import org.greenstone.gatherer.util.ArrayTools;
 import org.greenstone.gatherer.util.Utility;
 
@@ -266 +265 @@
     public void metadataChanged(MSMEvent event) {
     FileNode file_node = event.getRecord();
+
     // First check whether this record is one of those that we have showing.
-    if (file_nodes != null && file_nodes.length > 0 && file_node != null && ArrayTools.contains(file_nodes, file_node)) {
-        // Brute force solution... rebuild the table.
-        rebuildModel();
+    if (file_nodes != null && file_nodes.length > 0 && file_node != null) {
+        for (int i = 0; i < file_nodes.length; i++) {
+        if (file_nodes[i].equals(file_node)) {
+            // Brute force solution... rebuild the table.
+            rebuildModel();
+            return;
+        }
+        }
     }
     }

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

@@ -13 +13 @@
 import java.util.*;
 import javax.swing.filechooser.*;
-import org.greenstone.gatherer.file.FileNode;
 import org.w3c.dom.*;
 
@@ -122 +121 @@
     }
 
-    /** This method efficiently appends a new FileNode onto the end of a FileNode array.
-     * @param a The initial <strong>FileNode[]</strong>.
-     * @param b The new <strong>FileNode</strong>.
-     * @return An <strong>FileNode[]</strong> containing a followed by b.
-     */
-    static public FileNode[] add(FileNode a[], FileNode b) {
-    FileNode[] c = null;
-    if(a != null && b != null) {
-        c = new FileNode[a.length + 1];
-        System.arraycopy(a, 0, c, 0, a.length);
-        c[c.length - 1] = b;
-    }
-    else if(a == null && b != null) {
-        c = new FileNode[1];
-        c[0] = b;
-    }
-    else if(a != null && b == null) {
-        c = a;
-    }
-    return c;
-    }
-    /** This method efficently appends one FileNode array onto the end of another FileNode array.
-     * @param a The initial <strong>FileNode[]</strong>.
-     * @param b The <strong>FileNode[]</strong> to append.
-     * @return An <strong>FileNode[]</strong> containing a followed by b.
-     */
-    static final public FileNode[] add(FileNode a[], FileNode b[]) {
-    FileNode[] c = null;
-    if(a != null && b != null) {
-        c = new FileNode[a.length + b.length];
-        System.arraycopy(a, 0, c, 0, a.length);
-        System.arraycopy(b, 0, c, a.length, b.length);
-    }
-    else if(a == null && b != null) {
-        c = b;
-    }
-    else if(a != null && b == null) {
-        c = a;
-    }
-    return c;
-    }
-    /** Determine if a certain FileNode is present in an array of FileNodes.
-     * @param array The <strong>FileNode[]</strong>.
-     * @param a The <strong>FileNode</strong> we are searching for.
-     * @return <i>true</i> if the FileNode is in the array, <i>false</i> otherwise.
-     */
-    static final public boolean contains(FileNode array[], FileNode a) {
-    for(int i = 0; i < array.length; i++) {
-        if(array[i].equals(a)) {
-        return true;
-        }
-    }
-    return false;
-    }
 
     /** This method efficiently appends a new node onto the end of a node array.