X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fjbgui%2FGPCAPanel.java;h=a1837940b31e8a5388df55cae431f47472f01473;hb=937444414f2ff7d48f6ea8505144c2695d495e8c;hp=774641c4a95fd9bf5824fa8ec1fded8a43cb5d58;hpb=f588f27a1c31799c9245950ba349c5197afc3f1f;p=jalview.git diff --git a/src/jalview/jbgui/GPCAPanel.java b/src/jalview/jbgui/GPCAPanel.java index 774641c..a183794 100755 --- a/src/jalview/jbgui/GPCAPanel.java +++ b/src/jalview/jbgui/GPCAPanel.java @@ -52,7 +52,7 @@ public class GPCAPanel extends JInternalFrame protected JComboBox zCombobox = new JComboBox(); - protected JMenu scoreMatrixMenu = new JMenu(); + protected JMenu scoreModelMenu = new JMenu(); protected JMenu viewMenu = new JMenu(); @@ -66,8 +66,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(); @@ -187,8 +185,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 +224,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 +273,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 +297,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 +336,7 @@ public class GPCAPanel extends JInternalFrame viewMenu.add(associateViewsMenu); } - protected void scoreMatrix_menuSelected() + protected void scoreModel_menuSelected() { // TODO Auto-generated method stub @@ -435,10 +423,4 @@ public class GPCAPanel extends JInternalFrame { } - - protected void jvVersionSetting_actionPerfomed(ActionEvent arg0) - { - // TODO Auto-generated method stub - - } }