EditCommand implemented

[jalview.git] / src / jalview / gui / Finder.java

diff --git a/src/jalview/gui/Finder.java b/src/jalview/gui/Finder.java
index 5f215ed..8697552 100755 (executable)
--- a/src/jalview/gui/Finder.java
+++ b/src/jalview/gui/Finder.java
@@ -1,6 +1,6 @@
 /*\r
  * Jalview - A Sequence Alignment Editor and Viewer\r
- * Copyright (C) 2005 AM Waterhouse, J Procter, G Barton, M Clamp, S Searle\r
+ * Copyright (C) 2006 AM Waterhouse, J Procter, G Barton, M Clamp, S Searle\r
  *\r
  * This program is free software; you can redistribute it and/or\r
  * modify it under the terms of the GNU General Public License\r
@@ -42,7 +42,6 @@ public class Finder extends GFinder
     AlignViewport av;\r
     AlignmentPanel ap;\r
     JInternalFrame frame;\r
-    SuperGroup searchGroup;\r
     int seqIndex = 0;\r
     int resIndex = 0;\r
 \r
@@ -109,35 +108,35 @@ public class Finder extends GFinder
      */\r
     public void createNewGroup_actionPerformed(ActionEvent e)\r
     {\r
-        Color[] newColors = new Color[24];\r
+        JLabel label = new JLabel("Enter name of new sequence feature");\r
+        JTextField textinput = new JTextField(textfield.getText());\r
+        JPanel panel = new JPanel(new BorderLayout());\r
+        panel.add(label, BorderLayout.NORTH);\r
+        panel.add(textinput, BorderLayout.SOUTH);\r
 \r
-        for (int i = 0; i < 24; i++)\r
-        {\r
-            newColors[i] = new Color(60, 160, 115);\r
-        }\r
 \r
-        jalview.schemes.UserColourScheme ucs = new jalview.schemes.UserColourScheme(newColors);\r
-        String searchString = textfield.getText();\r
+        SequenceI [] seqs = new SequenceI[searchResults.getSize()];\r
+        SequenceFeature [] features = new SequenceFeature[searchResults.getSize()];\r
 \r
-        searchGroup = new SuperGroup(searchString, ucs, true, true, false);\r
 \r
         for (int i = 0; i < searchResults.getSize(); i ++ )\r
         {\r
-            // its possible edits may have occurred since search was performed\r
-            // account for this here\r
-            SequenceI seq = searchResults.getResultSequence(i);\r
-            int startRes = seq.findIndex(searchResults.getResultStart(i)) - 1;\r
-            int endRes = seq.findIndex(searchResults.getResultEnd(i)) - 1;\r
-\r
-            SequenceGroup sg = new SequenceGroup(searchString, ucs, true, true,\r
-                    false, startRes, endRes);\r
-            sg.addSequence(seq, false);\r
-            av.alignment.addGroup(sg);\r
-            searchGroup.addGroup(sg);\r
+            seqs[i] = searchResults.getResultSequence(i).getDatasetSequence();\r
+\r
+            features[i] = new SequenceFeature(textinput.getText(),\r
+                "Search Results", null,\r
+                searchResults.getResultStart(i),\r
+                searchResults.getResultEnd(i),\r
+               "Search Results");\r
         }\r
 \r
-        ap.av.alignment.addSuperGroup(searchGroup);\r
-        ap.highlightSearchResults(null);\r
+        if( ap.seqPanel.seqCanvas.getFeatureRenderer()\r
+            .createNewFeatures(seqs, features))\r
+        {\r
+          ap.alignFrame.showSeqFeatures.setSelected(true);\r
+          av.setShowSequenceFeatures(true);\r
+          ap.highlightSearchResults(null);\r
+        }\r
     }\r
 \r
     /**\r
@@ -149,7 +148,10 @@ public class Finder extends GFinder
     {\r
         createNewGroup.setEnabled(false);\r
 \r
-        String searchString = textfield.getText().toUpperCase().trim();\r
+        String searchString = textfield.getText().trim();\r
+        if(!caseSensitive.isSelected())\r
+          searchString = searchString.toUpperCase();\r
+\r
         if(searchString.length()<1)\r
           return;\r
 \r
@@ -166,7 +168,7 @@ public class Finder extends GFinder
         {\r
             int res = Integer.parseInt(searchString);\r
             found = true;\r
-            if (av.getSelectionGroup() == null || av.getSelectionGroup().getSize() < 1)\r
+            if (av.getSelectionGroup() == null || av.getSelectionGroup().getSize(false) < 1)\r
             {\r
               seq = (Sequence) av.getAlignment().getSequenceAt(0);\r
             }\r
@@ -182,16 +184,6 @@ public class Finder extends GFinder
         }\r
 \r
         ///////////////////////////////////////////////\r
-        Color[] newColors = new Color[24];\r
-\r
-        for (int i = 0; i < 24; i++)\r
-        {\r
-            newColors[i] = new Color(60, 160, 115);\r
-        }\r
-\r
-        jalview.schemes.UserColourScheme ucs = new jalview.schemes.UserColourScheme(newColors);\r
-\r
-        searchGroup = new SuperGroup(searchString, ucs, true, true, false);\r
 \r
         int end = av.alignment.getHeight();\r
 \r
@@ -199,7 +191,7 @@ public class Finder extends GFinder
 \r
         if (selection != null)\r
         {\r
-            if ((selection.getSize() < 1) ||\r
+            if ((selection.getSize(false) < 1) ||\r
                     ((selection.getEndRes() - selection.getStartRes()) < 2))\r
             {\r
                 selection = null;\r
@@ -210,7 +202,7 @@ public class Finder extends GFinder
         {\r
             seq = (Sequence) av.alignment.getSequenceAt(seqIndex);\r
 \r
-            if ((selection != null) && !selection.sequences.contains(seq))\r
+            if ((selection != null) && !selection.getSequences(false).contains(seq))\r
             {\r
                 seqIndex++;\r
                 resIndex = 0;\r
@@ -218,7 +210,9 @@ public class Finder extends GFinder
                 continue;\r
             }\r
 \r
-            item = seq.getSequence().toUpperCase();\r
+            item = seq.getSequence();\r
+            if(!caseSensitive.isSelected())\r
+              item = item.toUpperCase();\r
 \r
             if ((selection != null) &&\r
                     (selection.getEndRes() < av.alignment.getWidth()-1))\r