X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fjbgui%2FGTreePanel.java;h=d184e76f388f4c9d612c6f7434d5a46e49307e36;hb=038cd8338ccca1cec7e00979f796740add7c4aed;hp=47f94c51b22fc683f1e02c4e5e0cf1eea1709f47;hpb=cb5d856b1304448cae13a333cbd9017f81520d90;p=jalview.git

diff --git a/src/jalview/jbgui/GTreePanel.java b/src/jalview/jbgui/GTreePanel.java
index 47f94c5..d184e76 100755
--- a/src/jalview/jbgui/GTreePanel.java
+++ b/src/jalview/jbgui/GTreePanel.java
@@ -1,30 +1,43 @@
 /*
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8.0b1)
- * 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.ImageMaker.TYPE;
 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;
+
+@SuppressWarnings("serial")
 public class GTreePanel extends JInternalFrame
 {
   BorderLayout borderLayout1 = new BorderLayout();
@@ -79,6 +92,7 @@ public class GTreePanel extends JInternalFrame
 
   private void jbInit() throws Exception
   {
+    setName("jalview-tree");
     this.getContentPane().setLayout(borderLayout1);
     this.setBackground(Color.white);
     this.setFont(new java.awt.Font("Verdana", 0, 12));
@@ -87,6 +101,7 @@ public class GTreePanel extends JInternalFrame
     saveAsNewick.setText(MessageManager.getString("label.newick_format"));
     saveAsNewick.addActionListener(new ActionListener()
     {
+      @Override
       public void actionPerformed(ActionEvent e)
       {
         saveAsNewick_actionPerformed(e);
@@ -95,6 +110,7 @@ public class GTreePanel extends JInternalFrame
     printMenu.setText(MessageManager.getString("action.print"));
     printMenu.addActionListener(new java.awt.event.ActionListener()
     {
+      @Override
       public void actionPerformed(ActionEvent e)
       {
         printMenu_actionPerformed(e);
@@ -103,38 +119,46 @@ public class GTreePanel extends JInternalFrame
     viewMenu.setText(MessageManager.getString("action.view"));
     viewMenu.addMenuListener(new MenuListener()
     {
+      @Override
       public void menuSelected(MenuEvent e)
       {
         viewMenu_menuSelected();
       }
 
+      @Override
       public void menuDeselected(MenuEvent e)
       {
       }
 
+      @Override
       public void menuCanceled(MenuEvent e)
       {
       }
     });
-    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()
     {
+      @Override
       public void actionPerformed(ActionEvent e)
       {
-        sortByTree_actionPerformed(e);
+        sortByTree_actionPerformed();
       }
     });
     font.setText(MessageManager.getString("action.font"));
     font.addActionListener(new java.awt.event.ActionListener()
     {
+      @Override
       public void actionPerformed(ActionEvent e)
       {
         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()
     {
+      @Override
       public void actionPerformed(ActionEvent e)
       {
         bootstrapMenu_actionPerformed(e);
@@ -143,6 +167,7 @@ public class GTreePanel extends JInternalFrame
     distanceMenu.setText(MessageManager.getString("label.show_distances"));
     distanceMenu.addActionListener(new java.awt.event.ActionListener()
     {
+      @Override
       public void actionPerformed(ActionEvent e)
       {
         distanceMenu_actionPerformed(e);
@@ -152,6 +177,7 @@ public class GTreePanel extends JInternalFrame
     fitToWindow.setText(MessageManager.getString("label.fit_to_window"));
     fitToWindow.addActionListener(new java.awt.event.ActionListener()
     {
+      @Override
       public void actionPerformed(ActionEvent e)
       {
         fitToWindow_actionPerformed(e);
@@ -160,33 +186,38 @@ public class GTreePanel extends JInternalFrame
     epsTree.setText("EPS");
     epsTree.addActionListener(new java.awt.event.ActionListener()
     {
+      @Override
       public void actionPerformed(ActionEvent e)
       {
-        epsTree_actionPerformed(e);
+        writeTreeImage(TYPE.EPS);
       }
     });
     pngTree.setText("PNG");
     pngTree.addActionListener(new java.awt.event.ActionListener()
     {
+      @Override
       public void actionPerformed(ActionEvent e)
       {
-        pngTree_actionPerformed(e);
+        writeTreeImage(TYPE.PNG);
       }
     });
     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"));
+    placeholdersMenu.setToolTipText(MessageManager.getString(
+            "label.marks_leaves_tree_not_associated_with_sequence"));
+    placeholdersMenu.setText(
+            MessageManager.getString("label.mark_unlinked_leaves"));
     placeholdersMenu.addActionListener(new ActionListener()
     {
+      @Override
       public void actionPerformed(ActionEvent e)
       {
         placeholdersMenu_actionPerformed(e);
       }
     });
-    textbox.setText(MessageManager.getString("label.out_to_textbox") + "...");
+    textbox.setText(MessageManager.getString("label.out_to_textbox"));
     textbox.addActionListener(new ActionListener()
     {
+      @Override
       public void actionPerformed(ActionEvent e)
       {
         textbox_actionPerformed(e);
@@ -195,12 +226,14 @@ public class GTreePanel extends JInternalFrame
     originalSeqData.setText(MessageManager.getString("label.input_data"));
     originalSeqData.addActionListener(new ActionListener()
     {
+      @Override
       public void actionPerformed(ActionEvent e)
       {
         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);
@@ -240,11 +273,7 @@ public class GTreePanel extends JInternalFrame
   {
   }
 
-  public void pngTree_actionPerformed(ActionEvent e)
-  {
-  }
-
-  public void epsTree_actionPerformed(ActionEvent e)
+  public void writeTreeImage(TYPE imageType)
   {
   }
 
@@ -274,7 +303,7 @@ public class GTreePanel extends JInternalFrame
   {
   }
 
-  public void sortByTree_actionPerformed(ActionEvent e)
+  public void sortByTree_actionPerformed()
   {
 
   }