X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FFinder.java;h=bc5f8234f2130f65e5f9008329f2b887861323e8;hb=9493ac8f3b6a02d3cf9747ed6c0d6cf407d284e8;hp=bdd6861595110a94faf779eaa67eb07aafbc8e18;hpb=865a855a4ca87eadb3e5ff284ed32ed307d9c34b;p=jalview.git diff --git a/src/jalview/gui/Finder.java b/src/jalview/gui/Finder.java index bdd6861..bc5f823 100755 --- a/src/jalview/gui/Finder.java +++ b/src/jalview/gui/Finder.java @@ -1,30 +1,33 @@ /* - * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8.0b1) + * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8.2) * Copyright (C) 2014 The Jalview Authors * * This file is part of Jalview. * * Jalview is free software: you can redistribute it and/or * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. + * as published by the Free Software Foundation, either version 3 + * of the License, or (at your option) any later version. * * Jalview is distributed in the hope that it will be useful, but * WITHOUT ANY WARRANTY; without even the implied warranty * of MERCHANTABILITY or FITNESS FOR A PARTICULAR * 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 . + * 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! @@ -236,28 +239,33 @@ public class Finder extends GFinder // 'SelectRegion' selection if (!haveResults) { - JOptionPane.showInternalMessageDialog(this, "Finished searching", - null, JOptionPane.INFORMATION_MESSAGE); + JOptionPane.showInternalMessageDialog(this, + MessageManager.getString("label.finished_searching"), null, + JOptionPane.INFORMATION_MESSAGE); resIndex = -1; seqIndex = 0; } - - if (findAll) + else { - String message = (idMatch.size() > 0) ? "" + idMatch.size() + " IDs" - : ""; - if (searchResults != null) + 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; } }