X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FFinder.java;h=2bad00626ed1e0c10fea28ed95c8f77eeea3a8f4;hb=7459ed95f5ad213bafb1c691b193283850889e52;hp=6361a86be43713d20fa118150aa31cce8cc33c8a;hpb=f13c8f13408308b89e271ee9f4f11bd0493c1973;p=jalview.git diff --git a/src/jalview/gui/Finder.java b/src/jalview/gui/Finder.java index 6361a86..2bad006 100755 --- a/src/jalview/gui/Finder.java +++ b/src/jalview/gui/Finder.java @@ -28,7 +28,6 @@ import jalview.jbgui.GFinder; import jalview.util.MessageManager; import jalview.viewmodel.AlignmentViewport; -import java.awt.Dimension; import java.awt.event.ActionEvent; import java.awt.event.KeyEvent; import java.util.ArrayList; @@ -112,9 +111,8 @@ public class Finder extends GFinder }); addEscapeHandler(); Desktop.addInternalFrame(frame, MessageManager.getString("label.find"), - MY_WIDTH, MY_HEIGHT); - frame.setMinimumSize(new Dimension(MIN_WIDTH, MIN_HEIGHT)); - searchBox.requestFocus(); + true, MY_WIDTH, MY_HEIGHT, true, true); + searchBox.getComponent().requestFocus(); } /** @@ -217,7 +215,7 @@ public class Finder extends GFinder List seqs = new ArrayList(); List features = new ArrayList(); - String searchString = searchBox.getEditor().getItem().toString().trim(); + String searchString = searchBox.getUserInput(); String desc = "Search Results"; /* @@ -244,7 +242,7 @@ public class Finder extends GFinder { createFeatures.setEnabled(false); - String searchString = searchBox.getUserInput().trim(); + String searchString = searchBox.getUserInput(); if (isInvalidSearchString(searchString)) { @@ -304,7 +302,7 @@ public class Finder extends GFinder seqIndex = 0; JvOptionPane.showInternalMessageDialog(this, MessageManager.getString("label.finished_searching"), null, - JvOptionPane.INFORMATION_MESSAGE); + JvOptionPane.PLAIN_MESSAGE); } else { @@ -325,7 +323,7 @@ public class Finder extends GFinder resIndex = -1; seqIndex = 0; JvOptionPane.showInternalMessageDialog(this, message, null, - JvOptionPane.INFORMATION_MESSAGE); + JvOptionPane.PLAIN_MESSAGE); } } }