X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FAnnotationLabels.java;h=6b82a37e6bf6008fef112d055a5ec314563eb8e0;hb=b25d6f028eaea9c382500355b5d118cd40799a8e;hp=4148998649527a9cd075c3cf4e4c9752be7fb484;hpb=f6996637c284c21faf5a5d2d9f1335e8718b3da0;p=jalview.git

diff --git a/src/jalview/gui/AnnotationLabels.java b/src/jalview/gui/AnnotationLabels.java
index 4148998..6b82a37 100755
--- a/src/jalview/gui/AnnotationLabels.java
+++ b/src/jalview/gui/AnnotationLabels.java
@@ -485,7 +485,8 @@ public class AnnotationLabels extends JPanel
 
       if (cm.hasGroups())
       {
-        JCheckBoxMenuItem chitem = new JCheckBoxMenuItem("Show Groups on Matrix");
+        JCheckBoxMenuItem chitem = new JCheckBoxMenuItem(MessageManager.getString("action.show_groups_on_matrix"));
+        chitem.setToolTipText(MessageManager.getString("action.show_groups_on_matrix_tooltip"));
         boolean showGroups = alignmentAnnotation.isShowGroupsForContactMatrix();
         final AlignmentAnnotation sel_row=alignmentAnnotation;
         chitem.setState(showGroups);
@@ -504,7 +505,8 @@ public class AnnotationLabels extends JPanel
       }
       if (cm.hasTree())
       {
-        item = new JMenuItem("Show Tree for Matrix");
+        item = new JMenuItem(MessageManager.getString("action.show_tree_for_matrix"));
+        item.setToolTipText(MessageManager.getString("action.show_tree_for_matrix_tooltip"));
         item.addActionListener(new ActionListener()
         {
 
@@ -520,10 +522,10 @@ public class AnnotationLabels extends JPanel
       }
       else
       {
-        item = new JMenuItem("Calculate Tree for Matrix");
+        item = new JMenuItem(MessageManager.getString("action.cluster_matrix"));
+        item.setToolTipText(MessageManager.getString("action.cluster_matrix_tooltip"));
         item.addActionListener(new ActionListener()
         {
-          // TODO - refactor to analysis background thread
           @Override
           public void actionPerformed(ActionEvent e)
           {
@@ -532,9 +534,11 @@ public class AnnotationLabels extends JPanel
               @Override
               public void run()
               {
-                AlignmentAnnotation alan = alignmentAnnotation;
+                final long progBar;
+                ap.alignFrame.setProgressBar(MessageManager.formatMessage("action.clustering_matrix_for",cm.getAnnotDescr(),5f), progBar = System.currentTimeMillis());
                 cm.setGroupSet(GroupSet.makeGroups(cm, 5f, true));
-                ap.alignFrame.showContactMapTree(alan, cm);
+                ap.alignFrame.showContactMapTree(alignmentAnnotation, cm);
+                ap.alignFrame.setProgressBar(null, progBar);
               }
             }).start();
           }