X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fbinding%2FColour.java;h=7cd04b3796c2340068a07c773fe0e5fbc0fb732e;hb=1d6ae39a6442c455d362b933f1da89b0a481e5f5;hp=2a3423df64b823a5d6c728cbc3d51c0d83b36cbd;hpb=99c58ee0ae2a848f982552e53feaf6d5cb9925e5;p=jalview.git

diff --git a/src/jalview/binding/Colour.java b/src/jalview/binding/Colour.java
index 2a3423d..7cd04b3 100755
--- a/src/jalview/binding/Colour.java
+++ b/src/jalview/binding/Colour.java
@@ -4,7 +4,6 @@
  * Schema.
  * $Id$
  */
-
 /*
 * Jalview - A Sequence Alignment Editor and Viewer
 * Copyright (C) 2005 AM Waterhouse, J Procter, G Barton, M Clamp, S Searle
@@ -23,33 +22,32 @@
 * along with this program; if not, write to the Free Software
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
 */
-
 package jalview.binding;
 
-  //---------------------------------/
- //- Imported classes and packages -/
-//---------------------------------/
-
-import java.io.IOException;
-import java.io.Reader;
-import java.io.Serializable;
-import java.io.Writer;
 import org.exolab.castor.xml.MarshalException;
 import org.exolab.castor.xml.Marshaller;
 import org.exolab.castor.xml.Unmarshaller;
 import org.exolab.castor.xml.ValidationException;
+
 import org.xml.sax.ContentHandler;
 
+//---------------------------------/
+//- Imported classes and packages -/
+//---------------------------------/
+import java.io.IOException;
+import java.io.Reader;
+import java.io.Serializable;
+import java.io.Writer;
+
+
 /**
  * Class Colour.
  *
  * @version $Revision$ $Date$
  */
 public class Colour implements java.io.Serializable {
-
-
-      //--------------------------/
-     //- Class/Member Variables -/
+    //--------------------------/
+    //- Class/Member Variables -/
     //--------------------------/
 
     /**
@@ -62,30 +60,19 @@ public class Colour implements java.io.Serializable {
      */
     private java.lang.String _RGB;
 
-
-      //----------------/
-     //- Constructors -/
     //----------------/
-
+    //- Constructors -/
+    //----------------/
     public Colour() {
         super();
-    } //-- jalview.binding.Colour()
-
+    }
+     //-- jalview.binding.Colour()
+ //-----------/
 
-      //-----------/
-     //- Methods -/
-    //-----------/
-
-    /**
-     * Returns the value of field 'name'.
-     *
-     * @return String
-     * @return the value of field 'name'.
-     */
-    public java.lang.String getName()
-    {
+    public java.lang.String getName() {
         return this._name;
-    } //-- java.lang.String getName()
+    }
+     //-- java.lang.String getName()
 
     /**
      * Returns the value of field 'RGB'.
@@ -93,10 +80,10 @@ public class Colour implements java.io.Serializable {
      * @return String
      * @return the value of field 'RGB'.
      */
-    public java.lang.String getRGB()
-    {
+    public java.lang.String getRGB() {
         return this._RGB;
-    } //-- java.lang.String getRGB()
+    }
+     //-- java.lang.String getRGB()
 
     /**
      * Method isValid
@@ -105,16 +92,16 @@ public class Colour implements java.io.Serializable {
      *
      * @return boolean
      */
-    public boolean isValid()
-    {
+    public boolean isValid() {
         try {
             validate();
-        }
-        catch (org.exolab.castor.xml.ValidationException vex) {
+        } catch (org.exolab.castor.xml.ValidationException vex) {
             return false;
         }
+
         return true;
-    } //-- boolean isValid()
+    }
+     //-- boolean isValid()
 
     /**
      * Method marshal
@@ -124,11 +111,11 @@ public class Colour implements java.io.Serializable {
      * @param out
      */
     public void marshal(java.io.Writer out)
-        throws org.exolab.castor.xml.MarshalException, org.exolab.castor.xml.ValidationException
-    {
-
+        throws org.exolab.castor.xml.MarshalException, 
+            org.exolab.castor.xml.ValidationException {
         Marshaller.marshal(this, out);
-    } //-- void marshal(java.io.Writer)
+    }
+     //-- void marshal(java.io.Writer)
 
     /**
      * Method marshal
@@ -138,31 +125,31 @@ public class Colour implements java.io.Serializable {
      * @param handler
      */
     public void marshal(org.xml.sax.ContentHandler handler)
-        throws java.io.IOException, org.exolab.castor.xml.MarshalException, org.exolab.castor.xml.ValidationException
-    {
-
+        throws java.io.IOException, org.exolab.castor.xml.MarshalException, 
+            org.exolab.castor.xml.ValidationException {
         Marshaller.marshal(this, handler);
-    } //-- void marshal(org.xml.sax.ContentHandler)
+    }
+     //-- void marshal(org.xml.sax.ContentHandler)
 
     /**
      * Sets the value of field 'name'.
      *
      * @param name the value of field 'name'.
      */
-    public void setName(java.lang.String name)
-    {
+    public void setName(java.lang.String name) {
         this._name = name;
-    } //-- void setName(java.lang.String)
+    }
+     //-- void setName(java.lang.String)
 
     /**
      * Sets the value of field 'RGB'.
      *
      * @param RGB the value of field 'RGB'.
      */
-    public void setRGB(java.lang.String RGB)
-    {
+    public void setRGB(java.lang.String RGB) {
         this._RGB = RGB;
-    } //-- void setRGB(java.lang.String)
+    }
+     //-- void setRGB(java.lang.String)
 
     /**
      * Method unmarshal
@@ -173,20 +160,20 @@ public class Colour implements java.io.Serializable {
      * @return Object
      */
     public static java.lang.Object unmarshal(java.io.Reader reader)
-        throws org.exolab.castor.xml.MarshalException, org.exolab.castor.xml.ValidationException
-    {
-        return (jalview.binding.Colour) Unmarshaller.unmarshal(jalview.binding.Colour.class, reader);
-    } //-- java.lang.Object unmarshal(java.io.Reader)
+        throws org.exolab.castor.xml.MarshalException, 
+            org.exolab.castor.xml.ValidationException {
+        return (jalview.binding.Colour) Unmarshaller.unmarshal(jalview.binding.Colour.class,
+            reader);
+    }
+     //-- java.lang.Object unmarshal(java.io.Reader)
 
     /**
      * Method validate
      *
      */
-    public void validate()
-        throws org.exolab.castor.xml.ValidationException
-    {
+    public void validate() throws org.exolab.castor.xml.ValidationException {
         org.exolab.castor.xml.Validator validator = new org.exolab.castor.xml.Validator();
         validator.validate(this);
-    } //-- void validate()
-
+    }
+     //-- void validate()
 }