Merge branch 'spotless_2' into JAL-1551_2_11_3_spotlett

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

diff --git a/src/jalview/jbgui/GPCAPanel.java b/src/jalview/jbgui/GPCAPanel.java
index bd45bc2..cf7bc4e 100755 (executable)
--- a/src/jalview/jbgui/GPCAPanel.java
+++ b/src/jalview/jbgui/GPCAPanel.java
@@ -20,8 +20,6 @@
  */
 package jalview.jbgui;
 
-import jalview.util.MessageManager;
-
 import java.awt.BorderLayout;
 import java.awt.Color;
 import java.awt.FlowLayout;
@@ -42,6 +40,9 @@ import javax.swing.JPanel;
 import javax.swing.event.MenuEvent;
 import javax.swing.event.MenuListener;
 
+import jalview.util.ImageMaker.TYPE;
+import jalview.util.MessageManager;
+
 public class GPCAPanel extends JInternalFrame
 {
   private static final Font VERDANA_12 = new Font("Verdana", 0, 12);
@@ -62,6 +63,8 @@ public class GPCAPanel extends JInternalFrame
 
   protected JPanel statusPanel = new JPanel();
 
+  protected JMenuItem originalSeqData;
+
   /**
    * Constructor
    */
@@ -85,6 +88,8 @@ public class GPCAPanel extends JInternalFrame
 
   private void jbInit() throws Exception
   {
+    setFrameIcon(null);
+    setName("jalview-pca");
     this.getContentPane().setLayout(new BorderLayout());
     JPanel jPanel2 = new JPanel();
     jPanel2.setLayout(new FlowLayout());
@@ -147,7 +152,7 @@ public class GPCAPanel extends JInternalFrame
       @Override
       public void actionPerformed(ActionEvent e)
       {
-        eps_actionPerformed();
+        makePCAImage(TYPE.EPS);
       }
     });
     JMenuItem png = new JMenuItem("PNG");
@@ -156,7 +161,7 @@ public class GPCAPanel extends JInternalFrame
       @Override
       public void actionPerformed(ActionEvent e)
       {
-        png_actionPerformed();
+        makePCAImage(TYPE.PNG);
       }
     });
     JMenuItem outputValues = new JMenuItem();
@@ -238,7 +243,7 @@ public class GPCAPanel extends JInternalFrame
         bgcolour_actionPerformed();
       }
     });
-    JMenuItem originalSeqData = new JMenuItem();
+    originalSeqData = new JMenuItem();
     originalSeqData.setText(MessageManager.getString("label.input_data"));
     originalSeqData.addActionListener(new ActionListener()
     {
@@ -297,11 +302,7 @@ public class GPCAPanel extends JInternalFrame
   {
   }
 
-  protected void eps_actionPerformed()
-  {
-  }
-
-  protected void png_actionPerformed()
+  public void makePCAImage(TYPE imageType)
   {
   }