Merge branch 'develop' into features/JAL-3010ontologyFeatureSettings

[jalview.git] / src / jalview / controller / AlignViewController.java

diff --git a/src/jalview/controller/AlignViewController.java b/src/jalview/controller/AlignViewController.java
index c0a8629..078a820 100644 (file)
--- a/src/jalview/controller/AlignViewController.java
+++ b/src/jalview/controller/AlignViewController.java
@@ -166,9 +166,10 @@ public class AlignViewController implements AlignViewControllerI
     // JBPNote this routine could also mark rows, not just columns.
     // need a decent query structure to allow all types of feature searches
     BitSet bs = new BitSet();
-    SequenceCollectionI sqcol = (viewport.getSelectionGroup() == null
-            || extendCurrent) ? viewport.getAlignment()
-                    : viewport.getSelectionGroup();
+    boolean searchSelection = viewport.getSelectionGroup() != null
+            && !extendCurrent;
+    SequenceCollectionI sqcol = searchSelection ? viewport
+            .getSelectionGroup() : viewport.getAlignment();
 
     int nseq = findColumnsWithFeature(sqcol, bs, featureType);
 
@@ -178,8 +179,15 @@ public class AlignViewController implements AlignViewControllerI
       cs = new ColumnSelection();
     }
 
-    String featureTypeString = featureType.length == 1 ? featureType[0]
-            : featureType.toString();
+    String featureTypeString = featureType[0];
+    if (featureType.length > 1)
+    {
+      /*
+       * ellipsis if multiple feature types selected
+       * (from Summary View in Feature Settings)
+       */
+      featureTypeString += "...";
+    }
 
     if (bs.cardinality() > 0 || invert)
     {
@@ -207,8 +215,10 @@ public class AlignViewController implements AlignViewControllerI
     }
     else
     {
-      avcg.setStatus(MessageManager
-              .formatMessage("label.no_feature_of_type_found", new String[]
+      String key = searchSelection ? "label.no_feature_found_selection"
+              : "label.no_feature_of_type_found";
+      avcg.setStatus(
+              MessageManager.formatMessage(key, new String[]
               { featureTypeString }));
       if (!extendCurrent)
       {