X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fbinding%2FUserColours.java;h=77b1205ea93f20b01bfb3e7d9909d7d053b6e3d1;hb=865a855a4ca87eadb3e5ff284ed32ed307d9c34b;hp=f00e3418c9f13aa2ad25dd649e220bc4086a7d8f;hpb=efc31b4a8d5cee63555586804a2b79c06bdb5a14;p=jalview.git

diff --git a/src/jalview/binding/UserColours.java b/src/jalview/binding/UserColours.java
old mode 100755
new mode 100644
index f00e341..77b1205
--- a/src/jalview/binding/UserColours.java
+++ b/src/jalview/binding/UserColours.java
@@ -1,173 +1,192 @@
-/*
- * This class was automatically generated with
- * <a href="http://www.castor.org">Castor 0.9.6</a>, using an XML
- * Schema.
- * $Id$
- */
-
-package jalview.binding;
-
-//---------------------------------/
-//- Imported classes and packages -/
-//---------------------------------/
-
-import org.exolab.castor.xml.*;
-
-/**
- * Class UserColours.
- *
- * @version $Revision$ $Date$
- */
-public class UserColours
-    implements java.io.Serializable
-{
-
-  //--------------------------/
-  //- Class/Member Variables -/
-  //--------------------------/
-
-  /**
-   * Field _id
-   */
-  private java.lang.String _id;
-
-  /**
-   * Field _userColourScheme
-   */
-  private jalview.binding.UserColourScheme _userColourScheme;
-
-  //----------------/
-  //- Constructors -/
-  //----------------/
-
-  public UserColours()
-  {
-    super();
-  } //-- jalview.binding.UserColours()
-
-  //-----------/
-  //- Methods -/
-  //-----------/
-
-  /**
-   * Returns the value of field 'id'.
-   *
-   * @return String
-   * @return the value of field 'id'.
-   */
-  public java.lang.String getId()
-  {
-    return this._id;
-  } //-- java.lang.String getId()
-
-  /**
-   * Returns the value of field 'userColourScheme'.
-   *
-   * @return UserColourScheme
-   * @return the value of field 'userColourScheme'.
-   */
-  public jalview.binding.UserColourScheme getUserColourScheme()
-  {
-    return this._userColourScheme;
-  } //-- jalview.binding.UserColourScheme getUserColourScheme()
-
-  /**
-   * Method isValid
-   *
-   *
-   *
-   * @return boolean
-   */
-  public boolean isValid()
-  {
-    try
-    {
-      validate();
-    }
-    catch (org.exolab.castor.xml.ValidationException vex)
-    {
-      return false;
-    }
-    return true;
-  } //-- boolean isValid()
-
-  /**
-   * Method marshal
-   *
-   *
-   *
-   * @param out
-   */
-  public void marshal(java.io.Writer out)
-      throws org.exolab.castor.xml.MarshalException,
-      org.exolab.castor.xml.ValidationException
-  {
-
-    Marshaller.marshal(this, out);
-  } //-- 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
-  {
-
-    Marshaller.marshal(this, handler);
-  } //-- void marshal(org.xml.sax.ContentHandler)
-
-  /**
-   * Sets the value of field 'id'.
-   *
-   * @param id the value of field 'id'.
-   */
-  public void setId(java.lang.String id)
-  {
-    this._id = id;
-  } //-- void setId(java.lang.String)
-
-  /**
-   * Sets the value of field 'userColourScheme'.
-   *
-   * @param userColourScheme the value of field 'userColourScheme'
-   */
-  public void setUserColourScheme(jalview.binding.UserColourScheme
-                                  userColourScheme)
-  {
-    this._userColourScheme = userColourScheme;
-  } //-- void setUserColourScheme(jalview.binding.UserColourScheme)
-
-  /**
-   * 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
-  {
-    return (jalview.binding.UserColours) Unmarshaller.unmarshal(jalview.binding.
-        UserColours.class, reader);
-  } //-- java.lang.Object unmarshal(java.io.Reader)
-
-  /**
-   * Method validate
-   *
-   */
-  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()
-
-}
+/*
+ * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8.0b1)
+ * Copyright (C) 2014 The Jalview Authors
+ * 
+ * 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 
+ * 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/>.
+ * The Jalview Authors are detailed in the 'AUTHORS' file.
+ */
+package jalview.binding;
+
+//---------------------------------/
+//- Imported classes and packages -/
+//---------------------------------/
+
+import org.exolab.castor.xml.Marshaller;
+import org.exolab.castor.xml.Unmarshaller;
+
+/**
+ * Class UserColours.
+ * 
+ * @version $Revision$ $Date$
+ */
+public class UserColours implements java.io.Serializable
+{
+
+  // --------------------------/
+  // - Class/Member Variables -/
+  // --------------------------/
+
+  /**
+   * Field _id.
+   */
+  private java.lang.String _id;
+
+  /**
+   * Field _userColourScheme.
+   */
+  private jalview.binding.UserColourScheme _userColourScheme;
+
+  // ----------------/
+  // - Constructors -/
+  // ----------------/
+
+  public UserColours()
+  {
+    super();
+  }
+
+  // -----------/
+  // - Methods -/
+  // -----------/
+
+  /**
+   * Returns the value of field 'id'.
+   * 
+   * @return the value of field 'Id'.
+   */
+  public java.lang.String getId()
+  {
+    return this._id;
+  }
+
+  /**
+   * Returns the value of field 'userColourScheme'.
+   * 
+   * @return the value of field 'UserColourScheme'.
+   */
+  public jalview.binding.UserColourScheme getUserColourScheme()
+  {
+    return this._userColourScheme;
+  }
+
+  /**
+   * Method isValid.
+   * 
+   * @return true if this object is valid according to the schema
+   */
+  public boolean isValid()
+  {
+    try
+    {
+      validate();
+    } catch (org.exolab.castor.xml.ValidationException vex)
+    {
+      return false;
+    }
+    return true;
+  }
+
+  /**
+   * 
+   * 
+   * @param out
+   * @throws org.exolab.castor.xml.MarshalException
+   *           if object is null or if any SAXException is thrown during
+   *           marshaling
+   * @throws org.exolab.castor.xml.ValidationException
+   *           if this object is an invalid instance according to the schema
+   */
+  public void marshal(final java.io.Writer out)
+          throws org.exolab.castor.xml.MarshalException,
+          org.exolab.castor.xml.ValidationException
+  {
+    Marshaller.marshal(this, out);
+  }
+
+  /**
+   * 
+   * 
+   * @param handler
+   * @throws java.io.IOException
+   *           if an IOException occurs during marshaling
+   * @throws org.exolab.castor.xml.ValidationException
+   *           if this object is an invalid instance according to the schema
+   * @throws org.exolab.castor.xml.MarshalException
+   *           if object is null or if any SAXException is thrown during
+   *           marshaling
+   */
+  public void marshal(final org.xml.sax.ContentHandler handler)
+          throws java.io.IOException,
+          org.exolab.castor.xml.MarshalException,
+          org.exolab.castor.xml.ValidationException
+  {
+    Marshaller.marshal(this, handler);
+  }
+
+  /**
+   * Sets the value of field 'id'.
+   * 
+   * @param id
+   *          the value of field 'id'.
+   */
+  public void setId(final java.lang.String id)
+  {
+    this._id = id;
+  }
+
+  /**
+   * Sets the value of field 'userColourScheme'.
+   * 
+   * @param userColourScheme
+   *          the value of field 'userColourScheme'
+   */
+  public void setUserColourScheme(
+          final jalview.binding.UserColourScheme userColourScheme)
+  {
+    this._userColourScheme = userColourScheme;
+  }
+
+  /**
+   * Method unmarshal.
+   * 
+   * @param reader
+   * @throws org.exolab.castor.xml.MarshalException
+   *           if object is null or if any SAXException is thrown during
+   *           marshaling
+   * @throws org.exolab.castor.xml.ValidationException
+   *           if this object is an invalid instance according to the schema
+   * @return the unmarshaled jalview.binding.UserColours
+   */
+  public static jalview.binding.UserColours unmarshal(
+          final java.io.Reader reader)
+          throws org.exolab.castor.xml.MarshalException,
+          org.exolab.castor.xml.ValidationException
+  {
+    return (jalview.binding.UserColours) Unmarshaller.unmarshal(
+            jalview.binding.UserColours.class, reader);
+  }
+
+  /**
+   * 
+   * 
+   * @throws org.exolab.castor.xml.ValidationException
+   *           if this object is an invalid instance according to the schema
+   */
+  public void validate() throws org.exolab.castor.xml.ValidationException
+  {
+    org.exolab.castor.xml.Validator validator = new org.exolab.castor.xml.Validator();
+    validator.validate(this);
+  }
+
+}