X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fcontroller%2FAlignViewController.java;h=2fb9cdde4123dfdd87d0208c5263733991cad964;hb=599ce3ebcced809656e12ca0c0f69abd304f1577;hp=8087210fd06b31d0a3c4bff1b54754a7bc5fe66a;hpb=5a1324c30a40231bea443ff15c196ced9d6d51df;p=jalview.git

diff --git a/src/jalview/controller/AlignViewController.java b/src/jalview/controller/AlignViewController.java
index 8087210..2fb9cdd 100644
--- a/src/jalview/controller/AlignViewController.java
+++ b/src/jalview/controller/AlignViewController.java
@@ -168,8 +168,9 @@ public class AlignViewController implements AlignViewControllerI
     BitSet bs = new BitSet();
     boolean searchSelection = viewport.getSelectionGroup() != null
             && !extendCurrent;
-    SequenceCollectionI sqcol = searchSelection ? viewport
-            .getSelectionGroup() : viewport.getAlignment();
+    SequenceCollectionI sqcol = searchSelection
+            ? viewport.getSelectionGroup()
+            : viewport.getAlignment();
 
     int nseq = findColumnsWithFeature(featureType, sqcol, bs);
 
@@ -207,8 +208,9 @@ public class AlignViewController implements AlignViewControllerI
     {
       String key = searchSelection ? "label.no_feature_found_selection"
               : "label.no_feature_of_type_found";
-      avcg.setStatus(MessageManager.formatMessage(key,
-              new String[] { featureType }));
+      avcg.setStatus(
+              MessageManager.formatMessage(key, new String[]
+              { featureType }));
       if (!extendCurrent)
       {
         cs.clear();
@@ -229,11 +231,11 @@ public class AlignViewController implements AlignViewControllerI
    * @param bs
    * @return
    */
-  int findColumnsWithFeature(String featureType,
-          SequenceCollectionI sqcol, BitSet bs)
+  int findColumnsWithFeature(String featureType, SequenceCollectionI sqcol,
+          BitSet bs)
   {
-    FeatureRenderer fr = alignPanel == null ? null : alignPanel
-            .getFeatureRenderer();
+    FeatureRenderer fr = alignPanel == null ? null
+            : alignPanel.getFeatureRenderer();
 
     final int startColumn = sqcol.getStartRes() + 1; // converted to base 1
     final int endColumn = sqcol.getEndRes() + 1;
@@ -244,8 +246,8 @@ public class AlignViewController implements AlignViewControllerI
       if (sq != null)
       {
         // int ist = sq.findPosition(sqcol.getStartRes());
-        List<SequenceFeature> sfs = sq.findFeatures(startColumn,
-                endColumn, featureType);
+        List<SequenceFeature> sfs = sq.findFeatures(startColumn, endColumn,
+                featureType);
 
         boolean found = false;
         for (SequenceFeature sf : sfs)
@@ -322,7 +324,9 @@ public class AlignViewController implements AlignViewControllerI
    * 
    * @param types
    * @param methodText
+   *          - text shown in Undo/Redo command
    * @param method
+   *          - passed to jalview.analysis.AlignmentSorter.sortByFeatures()
    */
   protected void sortByFeatures(List<String> types, String methodText,
           final String method)
@@ -371,7 +375,7 @@ public class AlignViewController implements AlignViewControllerI
   }
 
   @Override
-  public boolean parseFeaturesFile(String file, DataSourceType protocol,
+  public boolean parseFeaturesFile(Object file, DataSourceType protocol,
           boolean relaxedIdMatching)
   {
     boolean featuresAdded = false;
@@ -457,7 +461,7 @@ public class AlignViewController implements AlignViewControllerI
     else
     {
       avcg.setStatus(MessageManager
-              .formatMessage("No highlighted regions marked"));
+              .getString("label.no_highlighted_regions_marked"));
       if (!extendCurrent)
       {
         cs.clear();