Changeset 2225 for trunk/java-client/org/nzdl/gsdl/SimpleGraphicalClient/CSModel.java

Timestamp:

2001-03-26T19:07:55+12:00 (23 years ago)

Author:

daven

Message:

added QueryHistory, tooltips on collectionInfoButton. Altered
CSModel to retain CollectionInfo objects and longCollectionNames
for performance. Added files for a BerryBasket - to be turned on
soon. Added sorting of the QueryHistory via the TableMap and TableSorter
files - from the Java Swing tutorial - not sure about GPL status
of these 2.

File:

• trunk/java-client/org/nzdl/gsdl/SimpleGraphicalClient/CSModel.java (modified) (6 diffs)

trunk/java-client/org/nzdl/gsdl/SimpleGraphicalClient/CSModel.java

@@ -19 +19 @@
 package org.nzdl.gsdl.SimpleGraphicalClient;
 
+import java.util.*;
 import java.util.Set;
 import java.util.TreeSet;
@@ -28 +29 @@
 import org.nzdl.gsdl.service.NzdlService;
 import org.nzdl.gsdl.service.NzdlCollectionInfo;
+
 /**
  * Class 
@@ -43 +45 @@
 
   Vector collectionList;
+  TreeMap collectionInfoMap;
+    HashMap collectionNameMap;
   String currentCollection;
   ResultModel results;
   NzdlService nzdl;
+  QueryHistoryModel queryHistoryModel;
     
 
@@ -53 +58 @@
     results = new ResultModel();
     collectionList = new Vector();
+    collectionInfoMap = new TreeMap();
+    collectionNameMap = new HashMap();
+    queryHistoryModel = new QueryHistoryModel();
     currentCollection = "";
     initialiseCollection();
@@ -63 +71 @@
   }
 
-    
+    public QueryHistoryModel getQueryHistoryModel() {
+    return queryHistoryModel;
+    }
     
 
@@ -86 +96 @@
   /* collectionList methods */
 
-  public Vector getCollectionList()
-  {
-    return collectionList;
-  }
+    public Vector getCollectionList() {
+    return new Vector(collectionInfoMap.keySet());
+    }
 
-  public int getCollectionListSize() 
-  {
-    return collectionList.size();
-  }
-    
-  public void addCollection(String collection)
-  {
-    collectionList.add(collection);
-  }
+    public Collection getCollectionAsCollection() {
+    return (Collection)collectionInfoMap;
+    }
 
-  public void setCurrentCollection(String collection )
-  {
-    currentCollection = collection;
-  }
+    public int getCollectionListSize() {
+    return collectionInfoMap.size();
+    }
 
-  public String getCurrentCollection()
-  {
-    return currentCollection;
-  }
+    public NzdlCollectionInfo getCollectionInfo(String collectionName) {
+    return (NzdlCollectionInfo) collectionInfoMap.get(collectionName);
+    }
 
-  public String getFirstCollection()
-  {
-    if (collectionList.size() > 0)
-      return (String)collectionList.get(0);
-    else
-      return "no collections";
-  }
-  /**
-   *
-   */
-  public void initialiseCollection() 
-  {
-    Set collectionSet = nzdl.getCollectionSet(); // set of strings of collection titles
-    TreeSet orderedCollectionSet = new TreeSet(collectionSet);
-    // TreeSet automatically puts strings in alphabetical order
-    System.out.println("Number of collections on the server: " + 
-               orderedCollectionSet.size());
-    Iterator collectionSetIterator = orderedCollectionSet.iterator();
-    while (collectionSetIterator.hasNext() ) {
-      // object -> String
-      String collectionName = (String)collectionSetIterator.next(); 
-      NzdlCollectionInfo info = nzdl.getCollectionInfo(collectionName);
-      //System.err.println(info);
-      if (info != null && 
-      info.getBuildDate() != 0) {
-    addCollection(collectionName);
-    System.err.println("Adding " + collectionName + " to collection list...");
-      } // end if
-      else {
-    System.err.println("Collection " + collectionName + " getBuildDate() returned 0");
-      } // end else
-    } // end while  
 
+    public String getLongCollectionName(String collectionName) {
+    return (String) collectionNameMap.get(collectionName);
+    }
+
+
+    public String getCollectionDescription(String collectionName) {
+    Set descSet = nzdl.getMetaData(collectionName, "collection", "collectionextra");
+    if (descSet.size() == 1) 
+        return (String) descSet.toArray()[0];
+    else
+        return "collectionName has more than 1 collectionextra entry";
+    }
+
+
+    public void setCurrentCollection(String collection )
+        {
+        currentCollection = collection;
+        }
+
+    public String getCurrentCollection()
+        {
+        return currentCollection;
+        }
+
+    public String getFirstCollection()
+        {
+        if (getCollectionListSize() > 0)
+            return (String)collectionInfoMap.firstKey();
+        else
+            return "no collections";
+        }
+    /**
+     *
+     */
+    public void initialiseCollection() 
+        {
+        Set collectionSet = nzdl.getCollectionSet(); // set of strings of collection titles
+        TreeSet orderedCollectionSet = new TreeSet(collectionSet);
+        // TreeSet automatically puts strings in alphabetical order
+        System.out.println("Number of collections on the server: " + 
+                   orderedCollectionSet.size());
+        Iterator collectionSetIterator = orderedCollectionSet.iterator();
+        while (collectionSetIterator.hasNext() ) {
+            // object -> String
+            String collectionName = (String)collectionSetIterator.next(); 
+            NzdlCollectionInfo info = nzdl.getCollectionInfo(collectionName);
+            if (info != null && 
+            info.getBuildDate() != 0) {
+            collectionInfoMap.put(collectionName, info);
+            String longCollectionName = "";
+            Set n = nzdl.getMetaData(collectionName, "collection", "collectionname");
+            if (n.size() == 1) 
+                longCollectionName = (String) n.toArray()[0];
+            else 
+                longCollectionName = collectionName + " has more than 1 collectionname";
+            collectionNameMap.put(collectionName,longCollectionName );
+            System.err.println("Adding " + collectionName + " to collection list...");
+            } // end if
+            else {
+            System.err.println("Collection " + collectionName + " getBuildDate() returned 0");
+            } // end else
+        } // end while  
+        setCurrentCollection(getFirstCollection()); //assume at least one collection
     
-
-    setCurrentCollection(getFirstCollection()); //assume at least one collection
-    
-  }
+        }
     
     
-}
+    }