Changeset 2225 for trunk/java-client/org/nzdl/gsdl/SimpleGraphicalClient/SearchPanel.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/SearchPanel.java (modified) (5 diffs)

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

@@ -116 +116 @@
 
     collectionList = new JComboBox(csModel.getCollectionList()){
-    public boolean isFocusTraversable() {
-      return false;
-    }
-      };
-    collectionInfoButton = new JButton("Info...");
+           public boolean isFocusTraversable() {
+        return false;
+        }
+    };
+    collectionList.setEditable(false);
+     
+    collectionInfoButton = new JButton("Info...") {
+        public String getToolTipText(MouseEvent e) {
+        //return "more information on " + collectionList.getSelectedItem();
+        return "More information on " + csModel.getLongCollectionName((String)collectionList.getSelectedItem());
+        }
+    };
+    ToolTipManager.sharedInstance().registerComponent(collectionInfoButton);
     collectionInfoButton.addActionListener(this);
 
@@ -194 +202 @@
 
   public void actionPerformed(ActionEvent e) {
+      String collectionName = collectionList.getSelectedItem().toString();
     if (e.getSource() == searchButton ) {
       // cursor not set when RETURN pressed, only when button clicked ?
       windowParent.setCursor(Cursor.getPredefinedCursor(Cursor.WAIT_CURSOR));
       String queryString = searchTextField.getText();
-      String collectionName = collectionList.getSelectedItem().toString();
       System.err.println("Search started (" + collectionName + "): \"" + queryString + "\" ..." );
       //send query to collection
@@ -240 +248 @@
     resultsList.setSelectedIndex(0); // should be under Preference control!
       } // end else
+
+
+      csModel.getQueryHistoryModel().add( new QueryHistoryItem(new Query(queryString), new Date(), collectionName, "user"));
+
       titleMap.clear();
       titleMetaData.clear();
@@ -247 +259 @@
     else {
     if (e.getSource() == collectionInfoButton) {
-        CollectionInfoDialog cid = new CollectionInfoDialog(windowParent, collectionList.getSelectedItem().toString(), nzdl);
+        CollectionInfoDialog cid = new CollectionInfoDialog(windowParent, collectionName, csModel);
     }
     else {
@@ -287 +299 @@
           // treat as HTML
           displayAsHTML(sr);
-          htmlDoc.getImageData(nzdl, result.getCollectionName());
+          //htmlDoc.getImageData(nzdl, result.getCollectionName());
       }