Changeset 2319 for trunk/java-client

Timestamp:

2001-04-15T11:32:01+12:00 (23 years ago)

Author:

daven

Message:

use new APIs in service.*

Location:

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

Files:

• CollectionInfoDialog.java (modified) (2 diffs)
• SearchPanel.java (modified) (4 diffs)

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

@@ -65 +65 @@
 
     NzdlCollectionInfo collectionInfo =  csModel.getCollectionInfo(collectionName);
-    /*
-      Set n = nzdl.getMetaData(collectionName, "collection", "collectionname");
-      if (n.size() == 1) {
-      fullCollectionName =  (String) n.toArray()[0];
-      }
-      else {
-      System.err.println(collectionName + " has more than 1 collectionname");
-      }
-      n.clear();
-    */
+    
     collectionNamePanel = new JPanel();
     // collectionNamePanel.setBorder(BorderFactory.createEmptyBorder(2,2,2,2));
@@ -121 +112 @@
 
     JPanel descPanel = new JPanel();
+
     descString = csModel.getCollectionDescription(collectionName);
     //System.err.println(descString);
-    if (descString.length() > 0) {
+    if (collectionInfo.isCollectionDescription()) {
+        // insert this when it stops leaving extra \n in the text
+        //descString = collectionInfo.getCollectionDescription();
         descPanel.setBorder(BorderFactory.createCompoundBorder(BorderFactory.createEmptyBorder(10,2,5,2), BorderFactory.createTitledBorder("Description")));
         JTextPane descPane = new JTextPane();

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

@@ -230 +230 @@
 
     resultPopup = new JPopupMenu();
+    JMenuItem copyResultItem = new JMenuItem("Copy result");
     JMenuItem addBerryItem = new JMenuItem("Add to BerryBasket");
+
+    copyResultItem.addActionListener(new ActionListener() {
+        public void actionPerformed(ActionEvent e) {
+        System.err.println("copy result to clipboard");
+        }
+    });
+
+
+
+
     addBerryItem.addActionListener(new ActionListener() {
         public void actionPerformed(ActionEvent e) {
-        System.err.println("SelectedResult = " + selectedResult);
-        //System.err.println("add berry now...");
         csModel.getBerryBasketModel().add( new Berry(selectedResult.getQueryHistoryItem(),selectedResult.getDocID(),selectedResult.getCollectionName(), selectedResult.toString()));
         } // actionPerformed
     });
+    resultPopup.add(copyResultItem);
+    resultPopup.addSeparator();
     resultPopup.add(addBerryItem);
     MouseListener popupListener = new PopupListener();
@@ -310 +321 @@
       NzdlResultSet results = response.getResultSet();
       ArrayList docIDs = new ArrayList(results.getDocumentIDs());
-      searchTerms.setText(results.getOrderedTermFrequencyString());
+      searchTerms.setText(results.getTermFrequencyString());
 
       // paired collection of docIDs and Titles - but as Sets!
@@ -367 +378 @@
   class ResultListSelectionHandler implements ListSelectionListener {
 
-      // private Result previousSelection = null;
-
     public void valueChanged(ListSelectionEvent e) {
       // get the result object from the SelectedIndex
@@ -375 +384 @@
       if (e.getValueIsAdjusting()) { return; }
       Result result =  (Result) resultsList.getSelectedValue();
+      
       if ((result == Result.FAKE_RESULT) || (result == Result.INITIAL_FAKE_RESULT)) {
       documentPane.setStyledDocument( blankDoc );