Changeset 5536

Timestamp:

07/10/08 16:31:28 (7 weeks ago)

Author:

will

Message:

New tree model...

Location:

branches/OmeroEditor/src

Files:

• fields (added)
• fields/Field.java (moved) (moved from branches/OmeroEditor/src/treeModel/Field.java) (1 diff)
• search/IndexTermFinder.java (modified) (2 diffs)
• search/SearchController.java (modified) (6 diffs)
• treeModel/DynamicTreeDemo.java (modified) (2 diffs)
• treeModel/FieldRenderer.java (modified) (2 diffs)
• treeModel/Tree.java (modified) (1 diff)
• treeModel/TreeEditor.java (modified) (1 diff)
• treeModel/editActions/DeleteFields.java (modified) (1 diff)

branches/OmeroEditor/src/fields/Field.java

@@ -22 +22 @@
  */
 
-package treeModel;
+package fields;
 
 import java.util.HashMap;

branches/OmeroEditor/src/search/IndexTermFinder.java

@@ -24 +24 @@
 
 
+import java.io.IOException;
+import java.util.ArrayList;
 import java.util.Date;
 
+import org.apache.lucene.index.CorruptIndexException;
 import org.apache.lucene.index.IndexReader;
 import org.apache.lucene.index.TermEnum;
@@ -61 +64 @@
         public static String field = "contents";
         
-          public static void main(String[] args) throws Exception {
+          public static String[] getMatchingTerms(String searchString) {
                   
                   
                   Date start = new Date();
                   
-                String searchString = "ant";
+                searchString = searchString.toLowerCase();
                   
                 String searchField = "contents";
+                
+                ArrayList<String> matchingTerms = new ArrayList<String>();
 
-            IndexReader reader = IndexReader.open(index);
+        
+            IndexReader reader;
+                try {
+                        reader = IndexReader.open(index);
+                        TermEnum terms = reader.terms();
+                    
+                    int termCounter = 0;
+                    while (terms.next()) {
+                        // ignore terms unless from the field of interest
+                        String field = terms.term().field();
+                        if (! field.equals(searchField))
+                                continue;
+                        
+                        String term = terms.term().toString();
+                        term = term.replaceFirst(field + ":", "");
+                        
+                        if (term.startsWith(searchString)) {
+                                System.out.println(termCounter + " " + term);
+                                termCounter++;
+                                
+                                matchingTerms.add(term);
+                        }
+                    }
+                    
+                    Date end = new Date();
+                      System.out.println("Search took " + (end.getTime() - start.getTime()) +
+                                  " milliseconds");
+                      
+                    reader.close();
+                } catch (CorruptIndexException e) {
+                        // TODO Auto-generated catch block
+                        e.printStackTrace();
+                } catch (IOException e) {
+                        // TODO Auto-generated catch block
+                        e.printStackTrace();
+                }
 
-            TermEnum terms = reader.terms();
-            
-            int termCounter = 0;
-            while (terms.next()) {
-                // ignore terms unless from the field of interest
-                String field = terms.term().field();
-                if (! field.equals(searchField))
-                        continue;
-                
-                String term = terms.term().toString();
-                term = term.replaceFirst(field + ":", "");
-                
-                if (term.startsWith(searchString)) {
-                        System.out.println(termCounter + " " + term);
-                        termCounter++;
-                }
+            String[] results = new String[matchingTerms.size()]; 
+            int termIndex = 0;
+            for (String term : matchingTerms) {
+                results[termIndex] = term;
+                termIndex++;
             }
             
-            Date end = new Date();
-              System.out.println("Search took " + (end.getTime() - start.getTime()) +
-                          " milliseconds");
-              
-            reader.close();
+            return results;
           }
 }

branches/OmeroEditor/src/search/SearchController.java

@@ -2 +2 @@
 
 import java.awt.BorderLayout;
+import java.awt.Rectangle;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
+import java.beans.PropertyChangeEvent;
+import java.beans.PropertyChangeListener;
 import java.io.File;
 import java.io.FileNotFoundException;
@@ -13 +16 @@
 import javax.swing.Icon;
 import javax.swing.JButton;
+import javax.swing.JDialog;
 import javax.swing.JPanel;
 import javax.swing.JTextField;
+import javax.swing.event.DocumentEvent;
+import javax.swing.event.DocumentListener;
 import javax.swing.text.JTextComponent;
 
+import org.openmicroscopy.shoola.util.ui.HistoryDialog;
 import org.xml.sax.SAXParseException;
 
@@ -65 +72 @@
 public class SearchController 
         extends AbstractComponent
-        implements ActionListener {
+        implements ActionListener,
+        DocumentListener, PropertyChangeListener {
         
         /**
@@ -115 +123 @@
          */
         boolean displayControllerPanel = true;
+        
+        /**
+         * A popup to display the terms from the lucene index that match what the
+         * user is typing into the searchTermSource, so as to provide an
+         * Auto-Complete functionality. 
+         */
+        HistoryDialog popup;
         
         /**
@@ -133 +148 @@
         public void setSearchTermSource(JTextComponent searchTermSource) {
                 this.searchTermSource = searchTermSource;
+                searchTermSource.getDocument().addDocumentListener(this);
         }
         
@@ -312 +328 @@
                 else return null;
         }
+        
+        public void autoComplete() {
+                Rectangle rect = searchTermSource.getBounds();
+                String text = searchTermSource.getText();
+                if (text.length() < 2) return;
+                
+                String[] matchingTerms = IndexTermFinder.getMatchingTerms(text);
+                
+                popup = new HistoryDialog(matchingTerms, rect.width);
+                popup.addPropertyChangeListener(
+                                HistoryDialog.SELECTION_PROPERTY, this);
+                
+                popup.show(searchTermSource, 0, rect.height);
+                
+                searchTermSource.requestFocusInWindow();
+        }
+
+        public void insertUpdate(DocumentEvent e) {
+                autoComplete();
+        }
+        
+        public void changedUpdate(DocumentEvent e) {
+                autoComplete();
+        }
+        public void removeUpdate(DocumentEvent e) {
+                autoComplete();
+        }
+
+        public void propertyChange(PropertyChangeEvent evt) {
+                if (HistoryDialog.SELECTION_PROPERTY.equals(evt.getPropertyName())) {
+                        Object item = evt.getNewValue();
+                        searchTermSource.setText(item.toString());
+                        
+                        popup.setVisible(false);
+                        
+                }
+        }
 
 }

branches/OmeroEditor/src/treeModel/DynamicTreeDemo.java

@@ -51 +51 @@
 import javax.swing.tree.DefaultMutableTreeNode;
 import javax.swing.tree.DefaultTreeModel;
+
+import fields.Field;
 
 public class DynamicTreeDemo extends JPanel 
@@ -133 +135 @@
         } else if (REMOVE_COMMAND.equals(command)) {
             //Remove button clicked
-            treeEdit.removeCurrentNodes();
+            treeEdit.deleteSelectedFields();
         } else if (UNDO_COMMAND.equals(command)) {
             

branches/OmeroEditor/src/treeModel/FieldRenderer.java

@@ -25 +25 @@
 import java.awt.Component;
 
+import javax.swing.Icon;
 import javax.swing.JTree;
 import javax.swing.tree.DefaultTreeCellRenderer;
 import javax.swing.tree.TreeCellRenderer;
+
+import util.ImageFactory;
 
 //Java imports
@@ -58 +61 @@
                 hasFocus);
                         
+                        Icon bigIcon = ImageFactory.getInstance().getIcon(
+                                        ImageFactory.ALARM_ICON_64);
+                        
+                        setIcon(bigIcon);
+                        
                         return this;
         }

branches/OmeroEditor/src/treeModel/Tree.java

@@ -45 +45 @@
 import javax.swing.tree.DefaultMutableTreeNode;
 import javax.swing.tree.DefaultTreeModel;
-import javax.swing.tree.MutableTreeNode;
 import javax.swing.tree.TreePath;
-import javax.swing.tree.TreeSelectionModel;
 import javax.swing.event.TreeModelEvent;
 import javax.swing.event.TreeModelListener;

branches/OmeroEditor/src/treeModel/TreeEditor.java

@@ -71 +71 @@
         
          /** Remove the currently selected nodes. */
-    public void removeCurrentNodes() {
+    public void deleteSelectedFields() {
         UndoableEdit edit = new DeleteFields(treeModel, tree.getSelectionPaths());
                 undoSupport.postEdit(edit);
     }
+    
+    
     
     

branches/OmeroEditor/src/treeModel/editActions/DeleteFields.java

@@ -87 +87 @@
         }
         
+        public static boolean canDo(TreePath[] selectedPaths) { 
+                return (selectedPaths.length > 0);
+        }
+        
         public void undo() {
                 TreeModelMethods.insertNodesInto(treeModel, deletedFields, parentNode,