X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FFinder.java;h=f53af3f37f967465590678356f5c2fb4cf046223;hb=d919b93d3c0a57e36c2a90a34a6788bca86bfe81;hp=909b55df92ad10e3d05ac0f7db7590f7d165d3c8;hpb=59d682209891099d46b960509907c79e3fb276fe;p=jalview.git diff --git a/src/jalview/gui/Finder.java b/src/jalview/gui/Finder.java index 909b55d..f53af3f 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.0b1) + * Copyright (C) 2014 The Jalview Authors * * This file is part of Jalview. * @@ -14,17 +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.*; import java.awt.event.*; + import javax.swing.*; import jalview.datamodel.*; import jalview.jbgui.*; +import jalview.util.MessageManager; /** * DOCUMENT ME! @@ -236,28 +237,30 @@ public class Finder extends GFinder // 'SelectRegion' selection if (!haveResults) { - JOptionPane.showInternalMessageDialog(this, "Finished searching", + JOptionPane.showInternalMessageDialog(this, MessageManager.getString("label.finished_searching"), 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; } }