JAL-3311 JAL-3141 JAL-3144 tidying obsolete message bundle entries

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

diff --git a/src/jalview/controller/AlignViewController.java b/src/jalview/controller/AlignViewController.java
index 8087210..7575583 100644 (file)
--- a/src/jalview/controller/AlignViewController.java
+++ b/src/jalview/controller/AlignViewController.java
@@ -315,14 +315,17 @@ public class AlignViewController implements AlignViewControllerI
   }
 
   /**
-   * Sorts the alignment (or current selection) by either average score or
-   * density of the specified feature types, and adds to the command history. If
-   * {@code types} is null, all visible feature types are used for the sort. If
-   * no feature types apply, does nothing.
+   * Sorts the alignment (or current selection) by either average score or density
+   * of the specified feature types, and adds to the command history. If
+   * {@code types} is null, all visible feature types are used for the sort. If no
+   * feature types apply, does nothing.
    * 
    * @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 +374,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;
@@ -456,8 +459,7 @@ public class AlignViewController implements AlignViewControllerI
     }
     else
     {
-      avcg.setStatus(MessageManager
-              .formatMessage("No highlighted regions marked"));
+      avcg.setStatus(MessageManager.getString("label.no_highlighted_regions_marked"));
       if (!extendCurrent)
       {
         cs.clear();