X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fappletgui%2FFinder.java;h=75d9b9e179996ce41c9f397ce34601126ad82a99;hb=4d7f98a6dd54d9863ba449ec79dcd95d25ed863d;hp=c442225068dd500c72de705693ef34891343f09e;hpb=47168f025aefdaa044802bd5f8f510ffe43a4808;p=jalview.git diff --git a/src/jalview/appletgui/Finder.java b/src/jalview/appletgui/Finder.java index c442225..75d9b9e 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,17 +20,31 @@ */ package jalview.appletgui; -import java.util.*; - -import java.awt.*; -import java.awt.event.*; - -import jalview.datamodel.*; +import jalview.datamodel.SearchResults; +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; @@ -57,7 +71,8 @@ public class Finder extends Panel implements ActionListener this.ap = ap; frame = new Frame(); frame.add(this); - jalview.bin.JalviewLite.addFrame(frame, MessageManager.getString("action.find"), 340, 120); + jalview.bin.JalviewLite.addFrame(frame, + MessageManager.getString("action.find"), 340, 120); frame.repaint(); frame.addWindowListener(new WindowAdapter() { @@ -112,7 +127,7 @@ public class Finder extends Panel implements ActionListener features, true, ap)) { ap.alignFrame.sequenceFeatures.setState(true); - av.showSequenceFeatures(true); + av.setShowSequenceFeatures(true); ap.highlightSearchResults(null); } } @@ -128,6 +143,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(); @@ -167,7 +183,8 @@ public class Finder extends Panel implements ActionListener // 'SelectRegion' selection if (!haveResults) { - ap.alignFrame.statusBar.setText(MessageManager.getString("label.finished_searching")); + ap.alignFrame.statusBar.setText(MessageManager + .getString("label.finished_searching")); resIndex = -1; seqIndex = 0; } @@ -186,13 +203,16 @@ 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})); + ap.alignFrame.statusBar.setText(MessageManager.formatMessage( + "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})); + ap.alignFrame.statusBar.setText(MessageManager.formatMessage( + "label.found_match_for", new String[] { searchString })); } } } @@ -205,7 +225,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(); @@ -213,6 +233,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)); @@ -221,7 +243,7 @@ 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() { public void keyTyped(KeyEvent e) @@ -237,8 +259,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); @@ -247,14 +269,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)