X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;ds=inline;f=src%2Fjalview%2Fgui%2FFinder.java;h=3161271ac7593ba3f7bea5ddcb8d2a0c3504d27a;hb=1b9fc500a75a38d7c4408d4b209384d5236911cc;hp=ce71f1880b9abdb3e5e0be8de5ebb442a8ab8ca7;hpb=21c29b20790ac555b2e2a124a034f6c6b4486270;p=jalview.git diff --git a/src/jalview/gui/Finder.java b/src/jalview/gui/Finder.java index ce71f18..3161271 100755 --- a/src/jalview/gui/Finder.java +++ b/src/jalview/gui/Finder.java @@ -1,6 +1,6 @@ /* - * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8) - * Copyright (C) 2012 J Procter, AM Waterhouse, LM Lui, J Engelhardt, G Barton, M Clamp, S Searle + * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8.1) + * Copyright (C) 2014 The Jalview Authors * * This file is part of Jalview. * @@ -14,16 +14,18 @@ * PURPOSE. See the GNU General Public License for more details. * * You should have received a copy of the GNU General Public License along with Jalview. If not, see . + * The Jalview Authors are detailed in the 'AUTHORS' file. */ package jalview.gui; import java.util.*; - import java.awt.event.*; + import javax.swing.*; import jalview.datamodel.*; import jalview.jbgui.*; +import jalview.util.MessageManager; /** * DOCUMENT ME! @@ -239,24 +241,26 @@ public class Finder extends GFinder null, JOptionPane.INFORMATION_MESSAGE); resIndex = -1; seqIndex = 0; - } - - if (findAll) - { - String message = (idMatch.size() > 0) ? "" + idMatch.size() + " IDs" - : ""; - if (searchResults != null) + } else { + if (findAll) { - if (idMatch.size() > 0 && searchResults.getSize() > 0) + // then we report the matches that were found + String message = (idMatch.size() > 0) ? "" + idMatch.size() + + " IDs" : ""; + if (searchResults != null) { - message += " and "; + if (idMatch.size() > 0 && searchResults.getSize() > 0) + { + message += " and "; + } + message += searchResults.getSize() + + " subsequence matches found."; } - message += searchResults.getSize() + " subsequence matches found."; + JOptionPane.showInternalMessageDialog(this, message, null, + JOptionPane.INFORMATION_MESSAGE); + resIndex = -1; + seqIndex = 0; } - JOptionPane.showInternalMessageDialog(this, message, null, - JOptionPane.INFORMATION_MESSAGE); - resIndex = -1; - seqIndex = 0; } }