X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fbinding%2FColour.java;h=a51102ba207180d2ff03d5ffe4915adaa2ea0417;hb=2ac5b6423fe366e093c8f12b0935aefc9aafbe5f;hp=4e57c3f616842f0d233b59563b9faa1e2d5db1fd;hpb=efc31b4a8d5cee63555586804a2b79c06bdb5a14;p=jalview.git diff --git a/src/jalview/binding/Colour.java b/src/jalview/binding/Colour.java index 4e57c3f..a51102b 100755 --- a/src/jalview/binding/Colour.java +++ b/src/jalview/binding/Colour.java @@ -1,36 +1,36 @@ /* - * This class was automatically generated with + * This class was automatically generated with * Castor 0.9.6, using an XML * Schema. * $Id$ */ -package jalview.binding; -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; +package jalview.binding; + //---------------------------------/ + //- Imported classes and packages -/ //---------------------------------/ -//- 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; /** * Class Colour. - * + * * @version $Revision$ $Date$ */ -public class Colour implements java.io.Serializable -{ - //--------------------------/ - //- Class/Member Variables -/ +public class Colour implements java.io.Serializable { + + + //--------------------------/ + //- Class/Member Variables -/ //--------------------------/ /** @@ -43,148 +43,131 @@ public class Colour implements java.io.Serializable */ private java.lang.String _RGB; + + //----------------/ + //- Constructors -/ //----------------/ - //- Constructors -/ - //----------------/ - public Colour() - { + + public Colour() { super(); - } + } //-- jalview.binding.Colour() + - //-- jalview.binding.Colour() + //-----------/ + //- Methods -/ //-----------/ /** - * DOCUMENT ME! - * - * @return DOCUMENT ME! + * Returns the value of field 'name'. + * + * @return String + * @return the value of field 'name'. */ public java.lang.String getName() { return this._name; - } - - //-- java.lang.String getName() + } //-- java.lang.String getName() /** * Returns the value of field 'RGB'. - * + * * @return String * @return the value of field 'RGB'. */ public java.lang.String getRGB() { return this._RGB; - } - - //-- java.lang.String getRGB() + } //-- java.lang.String getRGB() /** * Method isValid - * - * - * + * + * + * * @return boolean */ public boolean isValid() { - try - { + 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 - * - * - * + * + * + * * @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 - * - * - * + * + * + * * @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) { 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) { this._RGB = RGB; - } - - //-- void setRGB(java.lang.String) + } //-- void setRGB(java.lang.String) /** * Method unmarshal - * - * - * + * + * + * * @param reader * @return Object */ public static java.lang.Object unmarshal(java.io.Reader reader) - throws org.exolab.castor.xml.MarshalException, - org.exolab.castor.xml.ValidationException + 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) + 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() }