JAL-1620 version bump and release notes

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

diff --git a/src/jalview/jbgui/GPCAPanel.java b/src/jalview/jbgui/GPCAPanel.java
index f5612dd..d63fd54 100755 (executable)
--- a/src/jalview/jbgui/GPCAPanel.java
+++ b/src/jalview/jbgui/GPCAPanel.java
@@ -1,19 +1,22 @@
 /*
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8)
- * Copyright (C) 2012 J Procter, AM Waterhouse, LM Lui, J Engelhardt, G Barton, M Clamp, S Searle
+ * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8.2b1)
+ * Copyright (C) 2014 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;
 
@@ -53,6 +56,8 @@ public class GPCAPanel extends JInternalFrame
 
   JMenu saveMenu = new JMenu();
 
+  protected JMenu scoreMatrixMenu = new JMenu();
+
   JMenuItem eps = new JMenuItem();
 
   JMenuItem png = new JMenuItem();
@@ -189,7 +194,8 @@ public class GPCAPanel extends JInternalFrame
         outputPoints_actionPerformed(e);
       }
     });
-    outputProjPoints.setText(MessageManager.getString("label.output_transformed_points") + "...");
+    outputProjPoints.setText(MessageManager
+            .getString("label.output_transformed_points") + "...");
     outputProjPoints.addActionListener(new ActionListener()
     {
       public void actionPerformed(ActionEvent e)
@@ -204,7 +210,7 @@ public class GPCAPanel extends JInternalFrame
         print_actionPerformed(e);
       }
     });
-    viewMenu.setText(MessageManager.getString("aciton.view"));
+    viewMenu.setText(MessageManager.getString("action.view"));
     viewMenu.addMenuListener(new MenuListener()
     {
       public void menuSelected(MenuEvent e)
@@ -220,6 +226,23 @@ public class GPCAPanel extends JInternalFrame
       {
       }
     });
+    scoreMatrixMenu.setText(MessageManager
+            .getString("label.select_score_model"));
+    scoreMatrixMenu.addMenuListener(new MenuListener()
+    {
+      public void menuSelected(MenuEvent e)
+      {
+        scoreMatrix_menuSelected();
+      }
+
+      public void menuDeselected(MenuEvent e)
+      {
+      }
+
+      public void menuCanceled(MenuEvent e)
+      {
+      }
+    });
     showLabels.setText(MessageManager.getString("label.show_labels"));
     showLabels.addActionListener(new ActionListener()
     {
@@ -229,7 +252,8 @@ public class GPCAPanel extends JInternalFrame
       }
     });
     print.setText(MessageManager.getString("action.print"));
-    bgcolour.setText(MessageManager.getString("label.background_colour") + "...");
+    bgcolour.setText(MessageManager.getString("label.background_colour")
+            + "...");
     bgcolour.addActionListener(new ActionListener()
     {
       public void actionPerformed(ActionEvent e)
@@ -245,9 +269,11 @@ 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"));
+    nuclSetting
+            .setText(MessageManager.getString("label.nucleotide_matrix"));
     protSetting.setText(MessageManager.getString("label.protein_matrix"));
     nuclSetting.addActionListener(new ActionListener()
     {
@@ -267,7 +293,8 @@ public class GPCAPanel extends JInternalFrame
         protSetting_actionPerfomed(arg0);
       }
     });
-    jvVersionSetting.setText(MessageManager.getString("label.jalview_pca_calculation"));
+    jvVersionSetting.setText(MessageManager
+            .getString("label.jalview_pca_calculation"));
     jvVersionSetting.addActionListener(new ActionListener()
     {
       @Override
@@ -279,6 +306,7 @@ public class GPCAPanel extends JInternalFrame
     calcSettings.add(jvVersionSetting);
     calcSettings.add(nuclSetting);
     calcSettings.add(protSetting);
+    calcSettings.add(scoreMatrixMenu);
     statusPanel.setLayout(statusPanelLayout);
     statusBar.setFont(new java.awt.Font("Verdana", 0, 12));
     // statusPanel.setBackground(Color.lightGray);
@@ -311,6 +339,12 @@ public class GPCAPanel extends JInternalFrame
     viewMenu.add(associateViewsMenu);
   }
 
+  protected void scoreMatrix_menuSelected()
+  {
+    // TODO Auto-generated method stub
+
+  }
+
   protected void resetButton_actionPerformed(ActionEvent e)
   {
     // TODO Auto-generated method stub