X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FUserDefinedColours.java;h=65eb135d3b10a3e63345701443c265a0014e2e59;hb=8a91e5ca60b3e9b96854cc753544d60f63a02810;hp=83f9d0ce8d590bd037beb7fb0d2c8e47a38287d5;hpb=3825c0853b33c036d396bb9e3f8b4d7b4966e5ad;p=jalview.git

diff --git a/src/jalview/gui/UserDefinedColours.java b/src/jalview/gui/UserDefinedColours.java
index 83f9d0c..65eb135 100755
--- a/src/jalview/gui/UserDefinedColours.java
+++ b/src/jalview/gui/UserDefinedColours.java
@@ -1,20 +1,19 @@
 /*
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.4)
- * Copyright (C) 2008 AM Waterhouse, J Procter, G Barton, M Clamp, S Searle
+ * Jalview - A Sequence Alignment Editor and Viewer (Version 2.5)
+ * Copyright (C) 2010 J Procter, AM Waterhouse, G Barton, M Clamp, S Searle
  * 
- * This program 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 2
- * of the License, or (at your option) any later version.
+ * This file is part of Jalview.
  * 
- * This program 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.
+ * 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.
  * 
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
+ * 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/>.
  */
 package jalview.gui;
 
@@ -60,9 +59,9 @@ public class UserDefinedColours extends GUserDefinedColours implements
    * Creates a new UserDefinedColours object.
    * 
    * @param ap
-   *                DOCUMENT ME!
+   *          DOCUMENT ME!
    * @param sg
-   *                DOCUMENT ME!
+   *          DOCUMENT ME!
    */
   public UserDefinedColours(AlignmentPanel ap, SequenceGroup sg)
   {
@@ -218,7 +217,7 @@ public class UserDefinedColours extends GUserDefinedColours implements
    * DOCUMENT ME!
    * 
    * @param evt
-   *                DOCUMENT ME!
+   *          DOCUMENT ME!
    */
   public void stateChanged(ChangeEvent evt)
   {
@@ -249,7 +248,7 @@ public class UserDefinedColours extends GUserDefinedColours implements
    * DOCUMENT ME!
    * 
    * @param e
-   *                DOCUMENT ME!
+   *          DOCUMENT ME!
    */
   public void colourButtonPressed(MouseEvent e)
   {
@@ -344,9 +343,9 @@ public class UserDefinedColours extends GUserDefinedColours implements
    * DOCUMENT ME!
    * 
    * @param label
-   *                DOCUMENT ME!
+   *          DOCUMENT ME!
    * @param aa
-   *                DOCUMENT ME!
+   *          DOCUMENT ME!
    */
   JButton makeButton(String label, String aa, Vector caseSensitiveButtons,
           int buttonIndex)
@@ -373,7 +372,7 @@ public class UserDefinedColours extends GUserDefinedColours implements
       caseSensitiveButtons.addElement(button);
 
       col = Color.white;
-      if (oldColourScheme!=null)
+      if (oldColourScheme != null)
       {
         try
         {
@@ -405,7 +404,7 @@ public class UserDefinedColours extends GUserDefinedColours implements
    * DOCUMENT ME!
    * 
    * @param e
-   *                DOCUMENT ME!
+   *          DOCUMENT ME!
    */
   protected void okButton_actionPerformed(ActionEvent e)
   {
@@ -423,7 +422,7 @@ public class UserDefinedColours extends GUserDefinedColours implements
    * DOCUMENT ME!
    * 
    * @param e
-   *                DOCUMENT ME!
+   *          DOCUMENT ME!
    */
   protected void applyButton_actionPerformed(ActionEvent e)
   {
@@ -481,7 +480,7 @@ public class UserDefinedColours extends GUserDefinedColours implements
    * DOCUMENT ME!
    * 
    * @param e
-   *                DOCUMENT ME!
+   *          DOCUMENT ME!
    */
   protected void loadbutton_actionPerformed(ActionEvent e)
   {
@@ -581,7 +580,7 @@ public class UserDefinedColours extends GUserDefinedColours implements
    * DOCUMENT ME!
    * 
    * @param file
-   *                DOCUMENT ME!
+   *          DOCUMENT ME!
    * 
    * @return DOCUMENT ME!
    */
@@ -694,7 +693,7 @@ public class UserDefinedColours extends GUserDefinedColours implements
    * DOCUMENT ME!
    * 
    * @param e
-   *                DOCUMENT ME!
+   *          DOCUMENT ME!
    */
   protected void savebutton_actionPerformed(ActionEvent e)
   {
@@ -783,7 +782,7 @@ public class UserDefinedColours extends GUserDefinedColours implements
    * DOCUMENT ME!
    * 
    * @param e
-   *                DOCUMENT ME!
+   *          DOCUMENT ME!
    */
   protected void cancelButton_actionPerformed(ActionEvent e)
   {