From a3dec3a15090fd13168de2329ca30bc28b9fba60 Mon Sep 17 00:00:00 2001 From: Jim Procter Date: Wed, 26 Feb 2014 17:22:38 +0000 Subject: [PATCH] fix for JAL-1226 --- src/jalview/gui/Finder.java | 30 ++++++++++++++++-------------- 1 file changed, 16 insertions(+), 14 deletions(-) diff --git a/src/jalview/gui/Finder.java b/src/jalview/gui/Finder.java index b1e9907..f53af3f 100755 --- a/src/jalview/gui/Finder.java +++ b/src/jalview/gui/Finder.java @@ -241,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; } } -- 1.7.10.2