JAL-2089 patch broken merge to master for Release 2.10.0b1

[jalview.git] / src / jalview / jbgui / GTreePanel.java

diff --git a/src/jalview/jbgui/GTreePanel.java b/src/jalview/jbgui/GTreePanel.java
index d4f2254..fa5e905 100755 (executable)
--- a/src/jalview/jbgui/GTreePanel.java
+++ b/src/jalview/jbgui/GTreePanel.java
@@ -1,29 +1,40 @@
 /*
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8.2)
- * Copyright (C) 2014 The Jalview Authors
+ * Jalview - A Sequence Alignment Editor and Viewer ($$Version-Rel$$)
+ * Copyright (C) $$Year-Rel$$ The Jalview Authors
  * 
  * This file is part of Jalview.
  * 
  * Jalview is free software: you can redistribute it and/or
  * modify it under the terms of the GNU General Public License 
- * as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
+ * as published by the Free Software Foundation, either version 3
+ * of the License, or (at your option) any later version.
  *  
  * Jalview is distributed in the hope that it will be useful, but 
  * WITHOUT ANY WARRANTY; without even the implied warranty 
  * of MERCHANTABILITY or FITNESS FOR A PARTICULAR 
  * PURPOSE.  See the GNU General Public License for more details.
  * 
- * You should have received a copy of the GNU General Public License along with Jalview.  If not, see <http://www.gnu.org/licenses/>.
+ * You should have received a copy of the GNU General Public License
+ * along with Jalview.  If not, see <http://www.gnu.org/licenses/>.
  * The Jalview Authors are detailed in the 'AUTHORS' file.
  */
 package jalview.jbgui;
 
 import jalview.util.MessageManager;
 
-import java.awt.*;
-import java.awt.event.*;
-import javax.swing.*;
-import javax.swing.event.*;
+import java.awt.BorderLayout;
+import java.awt.Color;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+
+import javax.swing.JCheckBoxMenuItem;
+import javax.swing.JInternalFrame;
+import javax.swing.JMenu;
+import javax.swing.JMenuBar;
+import javax.swing.JMenuItem;
+import javax.swing.JScrollPane;
+import javax.swing.event.MenuEvent;
+import javax.swing.event.MenuListener;
 
 public class GTreePanel extends JInternalFrame
 {
@@ -116,12 +127,13 @@ public class GTreePanel extends JInternalFrame
       {
       }
     });
-    sortAssocViews.setText(MessageManager.getString("label.sort_alignment_by_tree"));
+    sortAssocViews.setText(MessageManager
+            .getString("label.sort_alignment_by_tree"));
     sortAssocViews.addActionListener(new java.awt.event.ActionListener()
     {
       public void actionPerformed(ActionEvent e)
       {
-        sortByTree_actionPerformed(e);
+        sortByTree_actionPerformed();
       }
     });
     font.setText(MessageManager.getString("action.font"));
@@ -132,7 +144,8 @@ public class GTreePanel extends JInternalFrame
         font_actionPerformed(e);
       }
     });
-    bootstrapMenu.setText(MessageManager.getString("label.show_bootstrap_values"));
+    bootstrapMenu.setText(MessageManager
+            .getString("label.show_bootstrap_values"));
     bootstrapMenu.addActionListener(new java.awt.event.ActionListener()
     {
       public void actionPerformed(ActionEvent e)
@@ -175,8 +188,10 @@ public class GTreePanel extends JInternalFrame
     });
     saveAsMenu.setText(MessageManager.getString("action.save_as"));
     placeholdersMenu
-            .setToolTipText(MessageManager.getString("label.marks_leaves_tree_not_associated_with_sequence"));
-    placeholdersMenu.setText(MessageManager.getString("label.mark_unlinked_leaves"));
+            .setToolTipText(MessageManager
+                    .getString("label.marks_leaves_tree_not_associated_with_sequence"));
+    placeholdersMenu.setText(MessageManager
+            .getString("label.mark_unlinked_leaves"));
     placeholdersMenu.addActionListener(new ActionListener()
     {
       public void actionPerformed(ActionEvent e)
@@ -184,7 +199,7 @@ public class GTreePanel extends JInternalFrame
         placeholdersMenu_actionPerformed(e);
       }
     });
-    textbox.setText(MessageManager.getString("label.out_to_textbox") + "...");
+    textbox.setText(MessageManager.getString("label.out_to_textbox"));
     textbox.addActionListener(new ActionListener()
     {
       public void actionPerformed(ActionEvent e)
@@ -200,7 +215,8 @@ public class GTreePanel extends JInternalFrame
         originalSeqData_actionPerformed(e);
       }
     });
-    associateLeavesMenu.setText(MessageManager.getString("label.associate_leaves_with"));
+    associateLeavesMenu.setText(MessageManager
+            .getString("label.associate_leaves_with"));
     this.getContentPane().add(scrollPane, BorderLayout.CENTER);
     jMenuBar1.add(fileMenu);
     jMenuBar1.add(viewMenu);
@@ -274,7 +290,7 @@ public class GTreePanel extends JInternalFrame
   {
   }
 
-  public void sortByTree_actionPerformed(ActionEvent e)
+  public void sortByTree_actionPerformed()
   {
 
   }