Changeset 2281 for trunk/java-client/org/nzdl/gsdl/SimpleGraphicalClient/SearchPanel.java

Timestamp:

2001-04-04T22:44:38+12:00 (23 years ago)

Author:

daven

Message:

turned on the BerryBasket. Try right-clicking on a result in the results List
to add one - no delete yet. Re-sizing maybe improved as well - no
guarantees yet though.

File:

• trunk/java-client/org/nzdl/gsdl/SimpleGraphicalClient/SearchPanel.java (modified) (8 diffs)

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

@@ -68 +68 @@
     JPanel queryTypePanel, searchControlPanel;
   JPanel collectionListPanel, searchTextFieldPanel, searchButtonPanel;
+    JPopupMenu resultPopup;
+    Result selectedResult;
+    ResultModel resultListModel;
   JList   resultsList;   
     JCheckBox stemCheckBox, caseFoldCheckBox;
@@ -207 +210 @@
     resultsPanel.setLayout(new BorderLayout());
     resultsPanel.setBorder(BorderFactory.createEmptyBorder(5,5,5,5));
-    ResultModel resultListModel = csModel.getResultsModel();
+    resultListModel = csModel.getResultsModel();
     resultsList = new JList(resultListModel); 
     resultsList.setFont(resultsFont);
@@ -215 +218 @@
     resultsPanel.add(scrollResultsPane, BorderLayout.CENTER);
     csModel.addResult(Result.INITIAL_FAKE_RESULT);
+
+    resultPopup = new JPopupMenu();
+    JMenuItem addBerryItem = new JMenuItem("Add to BerryBasket");
+    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(addBerryItem);
+    MouseListener popupListener = new PopupListener();
+    resultsList.addMouseListener(popupListener);
+
+
+
 
     dataPanel = new JPanel();
@@ -264 +283 @@
       NzdlQuery nzdlQuery = new NzdlQuery(queryString);
       nzdlQuery.setQueryType(buttonGroup.getSelection().getActionCommand());
-      System.err.println(buttonGroup.getSelection().getActionCommand());
       //nzdlQuery.setQueryType("boolean");
       nzdlQuery.setStemming(stemCheckBox.isSelected());
@@ -295 +313 @@
       // update the results list
       csModel.clearResults();
-      
+
+      QueryHistoryItem queryHistoryItem =  new QueryHistoryItem(new Query(queryString), new Date(), collectionName, "user",docIDs.size(),buttonGroup.getSelection().getActionCommand(),stemCheckBox.isSelected(), caseFoldCheckBox.isSelected());
+    csModel.getQueryHistoryModel().add(queryHistoryItem);
+
       if (docIDs.size() == 0 ) { // give some feedback for 0 results
     csModel.addResult(Result.FAKE_RESULT);
@@ -304 +325 @@
     while (docIDsIterator.hasNext()) {
       String resultDocID =  (String) docIDsIterator.next();
-      csModel.addResult(new Result((String)titleMap.get(resultDocID), resultDocID, collectionName ));
+      csModel.addResult(new Result((String)titleMap.get(resultDocID), resultDocID, collectionName, queryHistoryItem ));
     } //end while
     if (NzdlPreferences.getInstance().getBoolean(NzdlConstants.DISPLAY_FIRST_DOC))
@@ -310 +331 @@
       } // end else
 
-
+      /*
       csModel.getQueryHistoryModel().add( new QueryHistoryItem(new Query(queryString), new Date(), collectionName, "user",docIDs.size(),buttonGroup.getSelection().getActionCommand(),stemCheckBox.isSelected(), caseFoldCheckBox.isSelected() ));
-
+      */
       titleMap.clear();
       titleMetaData.clear();
@@ -443 +464 @@
 
 
+    class PopupListener extends MouseAdapter {
+    public void mousePressed(MouseEvent e) {
+        maybeShowPopup(e);
+    }
+
+    public void mouseReleased(MouseEvent e) {
+        maybeShowPopup(e);
+    }
+
+    private void maybeShowPopup(MouseEvent e) {
+        if (e.isPopupTrigger()) {
+        int index = resultsList.locationToIndex(new Point(e.getX(), e.getY()));
+        if (index < resultListModel.getSize()) {
+            Result result = (Result) resultListModel.getElementAt(index);
+            if (result != Result.INITIAL_FAKE_RESULT) {
+            selectedResult = result;
+            resultPopup.show(e.getComponent(),
+                     e.getX(), e.getY());
+            }
+        }
+        else
+            System.err.println("popup not on item");
+        }
+    }
+    } // PopupListener
+
+
+
 } //end SearchPanel