X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fappletgui%2FFinder.java;h=d2fe69c291198551a9b59dfc7ee04bf051de5103;hb=bde7de1e5fe8d7bb1a119b6193297755feaef52a;hp=4796bcae4d0827b110181f28ba2523134c172d3b;hpb=648f0d7f48b5865bd43b5edbe71f5e483f0cc455;p=jalview.git diff --git a/src/jalview/appletgui/Finder.java b/src/jalview/appletgui/Finder.java index 4796bca..d2fe69c 100644 --- a/src/jalview/appletgui/Finder.java +++ b/src/jalview/appletgui/Finder.java @@ -1,6 +1,6 @@ /* - * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8.2) - * Copyright (C) 2014 The Jalview Authors + * Jalview - A Sequence Alignment Editor and Viewer ($$Version-Rel$$) + * Copyright (C) $$Year-Rel$$ The Jalview Authors * * This file is part of Jalview. * @@ -20,23 +20,38 @@ */ package jalview.appletgui; -import java.util.*; - -import java.awt.*; -import java.awt.event.*; - -import jalview.datamodel.*; +import jalview.datamodel.SearchResultMatchI; +import jalview.datamodel.SearchResultsI; +import jalview.datamodel.SequenceFeature; +import jalview.datamodel.SequenceI; import jalview.util.MessageManager; +import jalview.viewmodel.AlignmentViewport; + +import java.awt.Button; +import java.awt.Checkbox; +import java.awt.Font; +import java.awt.Frame; +import java.awt.GridLayout; +import java.awt.Label; +import java.awt.Panel; +import java.awt.Rectangle; +import java.awt.TextField; +import java.awt.event.ActionEvent; +import java.awt.event.ActionListener; +import java.awt.event.KeyEvent; +import java.awt.event.WindowAdapter; +import java.awt.event.WindowEvent; +import java.util.Vector; public class Finder extends Panel implements ActionListener { - AlignViewport av; + AlignmentViewport av; AlignmentPanel ap; Frame frame; - SearchResults searchResults; + SearchResultsI searchResults; int seqIndex = 0; @@ -62,6 +77,7 @@ public class Finder extends Panel implements ActionListener frame.repaint(); frame.addWindowListener(new WindowAdapter() { + @Override public void windowClosing(WindowEvent evt) { ap.highlightSearchResults(null); @@ -70,6 +86,7 @@ public class Finder extends Panel implements ActionListener textfield.requestFocus(); } + @Override public void actionPerformed(ActionEvent evt) { if (evt.getSource() == textfield) @@ -100,13 +117,15 @@ public class Finder extends Panel implements ActionListener SequenceFeature[] features = new SequenceFeature[searchResults .getSize()]; - for (int i = 0; i < searchResults.getSize(); i++) + int i = 0; + for (SearchResultMatchI match : searchResults.getResults()) { - seqs[i] = searchResults.getResultSequence(i); + seqs[i] = match.getSequence().getDatasetSequence(); features[i] = new SequenceFeature(textfield.getText().trim(), - "Search Results", null, searchResults.getResultStart(i), - searchResults.getResultEnd(i), "Search Results"); + "Search Results", null, match.getStart(), match.getEnd(), + "Search Results"); + i++; } if (ap.seqPanel.seqCanvas.getFeatureRenderer().amendFeatures(seqs, @@ -129,6 +148,7 @@ public class Finder extends Panel implements ActionListener jalview.analysis.Finder finder = new jalview.analysis.Finder( av.getAlignment(), av.getSelectionGroup(), seqIndex, resIndex); finder.setCaseSensitive(caseSensitive.getState()); + finder.setIncludeDescription(searchDescription.getState()); finder.setFindAll(findAll); String searchString = textfield.getText(); @@ -137,7 +157,7 @@ public class Finder extends Panel implements ActionListener seqIndex = finder.getSeqIndex(); resIndex = finder.getResIndex(); searchResults = finder.getSearchResults(); - Vector idMatch = finder.getIdMatch(); + Vector idMatch = finder.getIdMatch(); boolean haveResults = false; // set or reset the GUI if ((idMatch.size() > 0)) @@ -189,16 +209,15 @@ public class Finder extends Panel implements ActionListener message += searchResults.getSize() + " subsequence matches."; } ap.alignFrame.statusBar.setText(MessageManager.formatMessage( - "label.search_results", new String[] - { searchString, message })); + "label.search_results", new String[] { searchString, + message })); } else { // TODO: indicate sequence and matching position in status bar ap.alignFrame.statusBar.setText(MessageManager.formatMessage( - "label.found_match_for", new String[] - { searchString })); + "label.found_match_for", new String[] { searchString })); } } } @@ -211,7 +230,7 @@ public class Finder extends Panel implements ActionListener protected Button findNext = new Button(); - Panel jPanel1 = new Panel(); + Panel actionsPanel = new Panel(); GridLayout gridLayout1 = new GridLayout(); @@ -219,6 +238,8 @@ public class Finder extends Panel implements ActionListener Checkbox caseSensitive = new Checkbox(); + Checkbox searchDescription = new Checkbox(); + private void jbInit() throws Exception { jLabel1.setFont(new java.awt.Font("Verdana", 0, 12)); @@ -227,9 +248,10 @@ public class Finder extends Panel implements ActionListener this.setLayout(null); textfield.setFont(new java.awt.Font("Verdana", Font.PLAIN, 10)); textfield.setText(""); - textfield.setBounds(new Rectangle(40, 27, 133, 21)); + textfield.setBounds(new Rectangle(40, 17, 133, 21)); textfield.addKeyListener(new java.awt.event.KeyAdapter() { + @Override public void keyTyped(KeyEvent e) { textfield_keyTyped(e); @@ -243,8 +265,8 @@ public class Finder extends Panel implements ActionListener findNext.setFont(new java.awt.Font("Verdana", Font.PLAIN, 10)); findNext.setLabel(MessageManager.getString("action.find_next")); findNext.addActionListener(this); - jPanel1.setBounds(new Rectangle(180, 5, 141, 64)); - jPanel1.setLayout(gridLayout1); + actionsPanel.setBounds(new Rectangle(195, 5, 141, 64)); + actionsPanel.setLayout(gridLayout1); gridLayout1.setHgap(0); gridLayout1.setRows(3); gridLayout1.setVgap(2); @@ -253,14 +275,19 @@ public class Finder extends Panel implements ActionListener createNewGroup.setLabel(MessageManager.getString("label.new_feature")); createNewGroup.addActionListener(this); caseSensitive.setLabel(MessageManager.getString("label.match_case")); - caseSensitive.setBounds(new Rectangle(40, 49, 126, 23)); - jPanel1.add(findNext, null); - jPanel1.add(findAll, null); - jPanel1.add(createNewGroup, null); + caseSensitive.setBounds(new Rectangle(30, 39, 126, 23)); + + searchDescription.setLabel(MessageManager + .getString("label.include_description")); + searchDescription.setBounds(new Rectangle(30, 59, 170, 23)); + actionsPanel.add(findNext, null); + actionsPanel.add(findAll, null); + actionsPanel.add(createNewGroup, null); this.add(caseSensitive); this.add(textfield, null); this.add(jLabel1, null); - this.add(jPanel1, null); + this.add(actionsPanel, null); + this.add(searchDescription); } void textfield_keyTyped(KeyEvent e)