Merge branch 'Jalview-BH/JAL-3026' into

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

diff --git a/src/jalview/jbgui/GPCAPanel.java b/src/jalview/jbgui/GPCAPanel.java
index 774641c..4a9770f 100755 (executable)
--- a/src/jalview/jbgui/GPCAPanel.java
+++ b/src/jalview/jbgui/GPCAPanel.java
@@ -20,6 +20,7 @@
  */
 package jalview.jbgui;
 
+import jalview.util.ImageMaker.TYPE;
 import jalview.util.MessageManager;
 
 import java.awt.BorderLayout;
@@ -52,7 +53,7 @@ public class GPCAPanel extends JInternalFrame
 
   protected JComboBox<String> zCombobox = new JComboBox<String>();
 
-  protected JMenu scoreMatrixMenu = new JMenu();
+  protected JMenu scoreModelMenu = new JMenu();
 
   protected JMenu viewMenu = new JMenu();
 
@@ -66,8 +67,6 @@ public class GPCAPanel extends JInternalFrame
 
   protected JCheckBoxMenuItem protSetting = new JCheckBoxMenuItem();
 
-  protected JCheckBoxMenuItem jvVersionSetting = new JCheckBoxMenuItem();
-
   protected JLabel statusBar = new JLabel();
 
   protected JPanel statusPanel = new JPanel();
@@ -154,7 +153,7 @@ public class GPCAPanel extends JInternalFrame
       @Override
       public void actionPerformed(ActionEvent e)
       {
-        eps_actionPerformed(e);
+        makePCAImage(TYPE.EPS);
       }
     });
     JMenuItem png = new JMenuItem("PNG");
@@ -163,7 +162,7 @@ public class GPCAPanel extends JInternalFrame
       @Override
       public void actionPerformed(ActionEvent e)
       {
-        png_actionPerformed(e);
+        makePCAImage(TYPE.PNG);
       }
     });
     JMenuItem outputValues = new JMenuItem();
@@ -187,8 +186,8 @@ public class GPCAPanel extends JInternalFrame
       }
     });
     JMenuItem outputProjPoints = new JMenuItem();
-    outputProjPoints.setText(MessageManager
-            .getString("label.output_transformed_points"));
+    outputProjPoints.setText(
+            MessageManager.getString("label.output_transformed_points"));
     outputProjPoints.addActionListener(new ActionListener()
     {
       @Override
@@ -226,14 +225,14 @@ public class GPCAPanel extends JInternalFrame
       {
       }
     });
-    scoreMatrixMenu.setText(MessageManager
-            .getString("label.select_score_model"));
-    scoreMatrixMenu.addMenuListener(new MenuListener()
+    scoreModelMenu
+            .setText(MessageManager.getString("label.select_score_model"));
+    scoreModelMenu.addMenuListener(new MenuListener()
     {
       @Override
       public void menuSelected(MenuEvent e)
       {
-        scoreMatrix_menuSelected();
+        scoreModel_menuSelected();
       }
 
       @Override
@@ -275,8 +274,8 @@ public class GPCAPanel extends JInternalFrame
         originalSeqData_actionPerformed(e);
       }
     });
-    associateViewsMenu.setText(MessageManager
-            .getString("label.associate_nodes_with"));
+    associateViewsMenu.setText(
+            MessageManager.getString("label.associate_nodes_with"));
     calcSettings.setText(MessageManager.getString("action.change_params"));
     nuclSetting
             .setText(MessageManager.getString("label.nucleotide_matrix"));
@@ -299,20 +298,10 @@ public class GPCAPanel extends JInternalFrame
         protSetting_actionPerfomed(arg0);
       }
     });
-    jvVersionSetting.setText(MessageManager
-            .getString("label.jalview_pca_calculation"));
-    jvVersionSetting.addActionListener(new ActionListener()
-    {
-      @Override
-      public void actionPerformed(ActionEvent arg0)
-      {
-        jvVersionSetting_actionPerfomed(arg0);
-      }
-    });
-    // calcSettings.add(jvVersionSetting); // todo remove? JAL-2416
+
     calcSettings.add(nuclSetting);
     calcSettings.add(protSetting);
-    calcSettings.add(scoreMatrixMenu);
+    calcSettings.add(scoreModelMenu);
     statusPanel.setLayout(new GridLayout());
     statusBar.setFont(VERDANA_12);
     // statusPanel.setBackground(Color.lightGray);
@@ -348,7 +337,7 @@ public class GPCAPanel extends JInternalFrame
     viewMenu.add(associateViewsMenu);
   }
 
-  protected void scoreMatrix_menuSelected()
+  protected void scoreModel_menuSelected()
   {
     // TODO Auto-generated method stub
 
@@ -396,14 +385,8 @@ public class GPCAPanel extends JInternalFrame
   {
   }
 
-  public void eps_actionPerformed(ActionEvent e)
-  {
-
-  }
-
-  public void png_actionPerformed(ActionEvent e)
+  public void makePCAImage(TYPE imageType)
   {
-
   }
 
   public void outputValues_actionPerformed(ActionEvent e)
@@ -435,10 +418,4 @@ public class GPCAPanel extends JInternalFrame
   {
 
   }
-
-  protected void jvVersionSetting_actionPerfomed(ActionEvent arg0)
-  {
-    // TODO Auto-generated method stub
-
-  }
 }