Merge branch 'Release_2_8_Branch' of https://source.jalview.org/git/jalview into...

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

diff --git a/src/jalview/jbgui/GStructureViewer.java b/src/jalview/jbgui/GStructureViewer.java
index b7a91e2..874b0ed 100644 (file)
--- a/src/jalview/jbgui/GStructureViewer.java
+++ b/src/jalview/jbgui/GStructureViewer.java
@@ -1,13 +1,13 @@
 /*
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.7)
- * Copyright (C) 2011 J Procter, AM Waterhouse, G Barton, M Clamp, S Searle
+ * 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
  * 
  * 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.
- * 
+ *  
  * 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 
@@ -169,10 +169,10 @@ public class GStructureViewer extends JInternalFrame
     {
       public void actionPerformed(ActionEvent actionEvent)
       {
-         purinePyrimidineColour_actionPerformed(actionEvent);
+        purinePyrimidineColour_actionPerformed(actionEvent);
       }
     });
-    
+
     userColour.setText("User Defined ...");
     userColour.addActionListener(new ActionListener()
     {
@@ -190,8 +190,7 @@ public class GStructureViewer extends JInternalFrame
       {
         jmolColour_actionPerformed(actionEvent);
       }
-    }
-    );
+    });
     helpMenu.setText("Help");
     jmolHelp.setText("Jmol Help");
     jmolHelp.addActionListener(new ActionListener()
@@ -310,9 +309,8 @@ public class GStructureViewer extends JInternalFrame
   protected JRadioButtonMenuItem turnColour = new JRadioButtonMenuItem();
 
   protected JRadioButtonMenuItem buriedColour = new JRadioButtonMenuItem();
-  
+
   protected JRadioButtonMenuItem purinePyrimidineColour = new JRadioButtonMenuItem();
-  
 
   protected JRadioButtonMenuItem userColour = new JRadioButtonMenuItem();
 
@@ -393,7 +391,7 @@ public class GStructureViewer extends JInternalFrame
   {
 
   }
-  
+
   public void purinePyrimidineColour_actionPerformed(ActionEvent actionEvent)
   {