Formatting changes

[jalview.git] / src / jalview / binding / Colour.java

diff --git a/src/jalview/binding/Colour.java b/src/jalview/binding/Colour.java
index 7cd04b3..4e57c3f 100755 (executable)
--- a/src/jalview/binding/Colour.java
+++ b/src/jalview/binding/Colour.java
@@ -4,24 +4,6 @@
  * Schema.\r
  * $Id$\r
  */\r
-/*\r
-* Jalview - A Sequence Alignment Editor and Viewer\r
-* Copyright (C) 2005 AM Waterhouse, J Procter, G Barton, M Clamp, S Searle\r
-*\r
-* This program is free software; you can redistribute it and/or\r
-* modify it under the terms of the GNU General Public License\r
-* as published by the Free Software Foundation; either version 2\r
-* of the License, or (at your option) any later version.\r
-*\r
-* This program is distributed in the hope that it will be useful,\r
-* but WITHOUT ANY WARRANTY; without even the implied warranty of\r
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\r
-* GNU General Public License for more details.\r
-*\r
-* You should have received a copy of the GNU General Public License\r
-* along with this program; if not, write to the Free Software\r
-* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA\r
-*/\r
 package jalview.binding;\r
 \r
 import org.exolab.castor.xml.MarshalException;\r
@@ -45,7 +27,8 @@ import java.io.Writer;
  *\r
  * @version $Revision$ $Date$\r
  */\r
-public class Colour implements java.io.Serializable {\r
+public class Colour implements java.io.Serializable\r
+{\r
     //--------------------------/\r
     //- Class/Member Variables -/\r
     //--------------------------/\r
@@ -63,16 +46,25 @@ public class Colour implements java.io.Serializable {
     //----------------/\r
     //- Constructors -/\r
     //----------------/\r
-    public Colour() {\r
+    public Colour()\r
+    {\r
         super();\r
     }\r
-     //-- jalview.binding.Colour()\r
- //-----------/\r
 \r
-    public java.lang.String getName() {\r
+    //-- jalview.binding.Colour()\r
+    //-----------/\r
+\r
+    /**\r
+     * DOCUMENT ME!\r
+     *\r
+     * @return DOCUMENT ME!\r
+     */\r
+    public java.lang.String getName()\r
+    {\r
         return this._name;\r
     }\r
-     //-- java.lang.String getName()\r
+\r
+    //-- java.lang.String getName() \r
 \r
     /**\r
      * Returns the value of field 'RGB'.\r
@@ -80,10 +72,12 @@ public class Colour implements java.io.Serializable {
      * @return String\r
      * @return the value of field 'RGB'.\r
      */\r
-    public java.lang.String getRGB() {\r
+    public java.lang.String getRGB()\r
+    {\r
         return this._RGB;\r
     }\r
-     //-- java.lang.String getRGB()\r
+\r
+    //-- java.lang.String getRGB() \r
 \r
     /**\r
      * Method isValid\r
@@ -92,16 +86,21 @@ public class Colour implements java.io.Serializable {
      *\r
      * @return boolean\r
      */\r
-    public boolean isValid() {\r
-        try {\r
+    public boolean isValid()\r
+    {\r
+        try\r
+        {\r
             validate();\r
-        } catch (org.exolab.castor.xml.ValidationException vex) {\r
+        }\r
+        catch (org.exolab.castor.xml.ValidationException vex)\r
+        {\r
             return false;\r
         }\r
 \r
         return true;\r
     }\r
-     //-- boolean isValid()\r
+\r
+    //-- boolean isValid() \r
 \r
     /**\r
      * Method marshal\r
@@ -112,10 +111,12 @@ public class Colour implements java.io.Serializable {
      */\r
     public void marshal(java.io.Writer out)\r
         throws org.exolab.castor.xml.MarshalException, \r
-            org.exolab.castor.xml.ValidationException {\r
+            org.exolab.castor.xml.ValidationException\r
+    {\r
         Marshaller.marshal(this, out);\r
     }\r
-     //-- void marshal(java.io.Writer)\r
+\r
+    //-- void marshal(java.io.Writer) \r
 \r
     /**\r
      * Method marshal\r
@@ -126,30 +127,36 @@ public class Colour implements java.io.Serializable {
      */\r
     public void marshal(org.xml.sax.ContentHandler handler)\r
         throws java.io.IOException, org.exolab.castor.xml.MarshalException, \r
-            org.exolab.castor.xml.ValidationException {\r
+            org.exolab.castor.xml.ValidationException\r
+    {\r
         Marshaller.marshal(this, handler);\r
     }\r
-     //-- void marshal(org.xml.sax.ContentHandler)\r
+\r
+    //-- void marshal(org.xml.sax.ContentHandler) \r
 \r
     /**\r
      * Sets the value of field 'name'.\r
      *\r
      * @param name the value of field 'name'.\r
      */\r
-    public void setName(java.lang.String name) {\r
+    public void setName(java.lang.String name)\r
+    {\r
         this._name = name;\r
     }\r
-     //-- void setName(java.lang.String)\r
+\r
+    //-- void setName(java.lang.String) \r
 \r
     /**\r
      * Sets the value of field 'RGB'.\r
      *\r
      * @param RGB the value of field 'RGB'.\r
      */\r
-    public void setRGB(java.lang.String RGB) {\r
+    public void setRGB(java.lang.String RGB)\r
+    {\r
         this._RGB = RGB;\r
     }\r
-     //-- void setRGB(java.lang.String)\r
+\r
+    //-- void setRGB(java.lang.String) \r
 \r
     /**\r
      * Method unmarshal\r
@@ -161,19 +168,23 @@ public class Colour implements java.io.Serializable {
      */\r
     public static java.lang.Object unmarshal(java.io.Reader reader)\r
         throws org.exolab.castor.xml.MarshalException, \r
-            org.exolab.castor.xml.ValidationException {\r
+            org.exolab.castor.xml.ValidationException\r
+    {\r
         return (jalview.binding.Colour) Unmarshaller.unmarshal(jalview.binding.Colour.class,\r
             reader);\r
     }\r
-     //-- java.lang.Object unmarshal(java.io.Reader)\r
+\r
+    //-- java.lang.Object unmarshal(java.io.Reader) \r
 \r
     /**\r
      * Method validate\r
      *\r
      */\r
-    public void validate() throws org.exolab.castor.xml.ValidationException {\r
+    public void validate() throws org.exolab.castor.xml.ValidationException\r
+    {\r
         org.exolab.castor.xml.Validator validator = new org.exolab.castor.xml.Validator();\r
         validator.validate(this);\r
     }\r
-     //-- void validate()\r
+\r
+    //-- void validate() \r
 }\r