X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;ds=inline;f=src%2Fjalview%2Fappletgui%2FFinder.java;h=583a5ade62fb1236c5a2c738424c54b05c7f7f23;hb=af563e083b2a94e50f23d317f260fb734c52c266;hp=2993fdb49782170963bc35e7d2815b4e603cd344;hpb=85024c0dee90b249ba1e03dc991ce0a4d0156cda;p=jalview.git diff --git a/src/jalview/appletgui/Finder.java b/src/jalview/appletgui/Finder.java index 2993fdb..583a5ad 100755 --- 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.6) - * Copyright (C) 2010 J Procter, AM Waterhouse, G Barton, M Clamp, S Searle + * Jalview - A Sequence Alignment Editor and Viewer (Version 2.7) + * Copyright (C) 2011 J Procter, AM Waterhouse, J Engelhardt, LM Lui, G Barton, M Clamp, S Searle * * This file is part of Jalview. * @@ -166,25 +166,30 @@ public class Finder extends Panel implements ActionListener ap.alignFrame.statusBar.setText("Finished searching."); resIndex = -1; seqIndex = 0; - } - if (findAll) - { - String message = (idMatch.size() > 0) ? "" + idMatch.size() + " IDs" - : ""; - if (idMatch.size() > 0 && searchResults != null - && searchResults.getSize() > 0) + } else { + if (findAll) { - message += " and "; + String message = (idMatch.size() > 0) ? "" + idMatch.size() + + " IDs" : ""; + if (idMatch.size() > 0 && searchResults != null + && searchResults.getSize() > 0) + { + message += " and "; + } + if (searchResults != null) + { + message += searchResults.getSize() + " subsequence matches."; + } + ap.alignFrame.statusBar.setText("Search results: " + searchString + + " : " + message); + } - if (searchResults != null) + else { - message += searchResults.getSize() + " subsequence matches."; + // TODO: indicate sequence and matching position in status bar + ap.alignFrame.statusBar.setText("Found match for " + searchString); } - ap.alignFrame.statusBar.setText("Search results: " + searchString - + " : " + message); - } - } Label jLabel1 = new Label();