git://source.jalview.org
/
jalview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
total annotation score is a double for maximum precision.
[jalview.git]
/
src
/
jalview
/
binding
/
Colour.java
diff --git
a/src/jalview/binding/Colour.java
b/src/jalview/binding/Colour.java
index
4e57c3f
..
a51102b
100755
(executable)
--- a/
src/jalview/binding/Colour.java
+++ b/
src/jalview/binding/Colour.java
@@
-1,36
+1,36
@@
/*
\r
/*
\r
- * This class was automatically generated with
\r
+ * This class was automatically generated with
\r
* <a href="http://www.castor.org">Castor 0.9.6</a>, using an XML
\r
* Schema.
\r
* $Id$
\r
*/
\r
* <a href="http://www.castor.org">Castor 0.9.6</a>, using an XML
\r
* Schema.
\r
* $Id$
\r
*/
\r
-package jalview.binding;
\r
\r
\r
-import org.exolab.castor.xml.MarshalException;
\r
-import org.exolab.castor.xml.Marshaller;
\r
-import org.exolab.castor.xml.Unmarshaller;
\r
-import org.exolab.castor.xml.ValidationException;
\r
-
\r
-import org.xml.sax.ContentHandler;
\r
+package jalview.binding;
\r
\r
\r
+ //---------------------------------/
\r
+ //- Imported classes and packages -/
\r
//---------------------------------/
\r
//---------------------------------/
\r
-//- Imported classes and packages -/
\r
-//---------------------------------/
\r
+
\r
import java.io.IOException;
\r
import java.io.Reader;
\r
import java.io.Serializable;
\r
import java.io.Writer;
\r
import java.io.IOException;
\r
import java.io.Reader;
\r
import java.io.Serializable;
\r
import java.io.Writer;
\r
-
\r
+import org.exolab.castor.xml.MarshalException;
\r
+import org.exolab.castor.xml.Marshaller;
\r
+import org.exolab.castor.xml.Unmarshaller;
\r
+import org.exolab.castor.xml.ValidationException;
\r
+import org.xml.sax.ContentHandler;
\r
\r
/**
\r
* Class Colour.
\r
\r
/**
\r
* Class Colour.
\r
- *
\r
+ *
\r
* @version $Revision$ $Date$
\r
*/
\r
* @version $Revision$ $Date$
\r
*/
\r
-public class Colour implements java.io.Serializable
\r
-{
\r
- //--------------------------/
\r
- //- Class/Member Variables -/
\r
+public class Colour implements java.io.Serializable {
\r
+
\r
+
\r
+ //--------------------------/
\r
+ //- Class/Member Variables -/
\r
//--------------------------/
\r
\r
/**
\r
//--------------------------/
\r
\r
/**
\r
@@
-43,148
+43,131
@@
public class Colour implements java.io.Serializable
*/
\r
private java.lang.String _RGB;
\r
\r
*/
\r
private java.lang.String _RGB;
\r
\r
+
\r
+ //----------------/
\r
+ //- Constructors -/
\r
//----------------/
\r
//----------------/
\r
- //- Constructors -/
\r
- //----------------/
\r
- public Colour()
\r
- {
\r
+
\r
+ public Colour() {
\r
super();
\r
super();
\r
- }
\r
+ } //-- jalview.binding.Colour()
\r
+
\r
\r
\r
- //-- jalview.binding.Colour()
\r
+ //-----------/
\r
+ //- Methods -/
\r
//-----------/
\r
\r
/**
\r
//-----------/
\r
\r
/**
\r
- * DOCUMENT ME!
\r
- *
\r
- * @return DOCUMENT ME!
\r
+ * Returns the value of field 'name'.
\r
+ *
\r
+ * @return String
\r
+ * @return the value of field 'name'.
\r
*/
\r
public java.lang.String getName()
\r
{
\r
return this._name;
\r
*/
\r
public java.lang.String getName()
\r
{
\r
return this._name;
\r
- }
\r
-
\r
- //-- java.lang.String getName()
\r
+ } //-- java.lang.String getName()
\r
\r
/**
\r
* Returns the value of field 'RGB'.
\r
\r
/**
\r
* Returns the value of field 'RGB'.
\r
- *
\r
+ *
\r
* @return String
\r
* @return the value of field 'RGB'.
\r
*/
\r
public java.lang.String getRGB()
\r
{
\r
return this._RGB;
\r
* @return String
\r
* @return the value of field 'RGB'.
\r
*/
\r
public java.lang.String getRGB()
\r
{
\r
return this._RGB;
\r
- }
\r
-
\r
- //-- java.lang.String getRGB()
\r
+ } //-- java.lang.String getRGB()
\r
\r
/**
\r
* Method isValid
\r
\r
/**
\r
* Method isValid
\r
- *
\r
- *
\r
- *
\r
+ *
\r
+ *
\r
+ *
\r
* @return boolean
\r
*/
\r
public boolean isValid()
\r
{
\r
* @return boolean
\r
*/
\r
public boolean isValid()
\r
{
\r
- try
\r
- {
\r
+ try {
\r
validate();
\r
}
\r
validate();
\r
}
\r
- catch (org.exolab.castor.xml.ValidationException vex)
\r
- {
\r
+ catch (org.exolab.castor.xml.ValidationException vex) {
\r
return false;
\r
}
\r
return false;
\r
}
\r
-
\r
return true;
\r
return true;
\r
- }
\r
-
\r
- //-- boolean isValid()
\r
+ } //-- boolean isValid()
\r
\r
/**
\r
* Method marshal
\r
\r
/**
\r
* Method marshal
\r
- *
\r
- *
\r
- *
\r
+ *
\r
+ *
\r
+ *
\r
* @param out
\r
*/
\r
public void marshal(java.io.Writer out)
\r
* @param out
\r
*/
\r
public void marshal(java.io.Writer out)
\r
- throws org.exolab.castor.xml.MarshalException,
\r
- org.exolab.castor.xml.ValidationException
\r
+ throws org.exolab.castor.xml.MarshalException, org.exolab.castor.xml.ValidationException
\r
{
\r
{
\r
+
\r
Marshaller.marshal(this, out);
\r
Marshaller.marshal(this, out);
\r
- }
\r
-
\r
- //-- void marshal(java.io.Writer)
\r
+ } //-- void marshal(java.io.Writer)
\r
\r
/**
\r
* Method marshal
\r
\r
/**
\r
* Method marshal
\r
- *
\r
- *
\r
- *
\r
+ *
\r
+ *
\r
+ *
\r
* @param handler
\r
*/
\r
public void marshal(org.xml.sax.ContentHandler handler)
\r
* @param handler
\r
*/
\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
+ throws java.io.IOException, org.exolab.castor.xml.MarshalException, org.exolab.castor.xml.ValidationException
\r
{
\r
{
\r
+
\r
Marshaller.marshal(this, handler);
\r
Marshaller.marshal(this, handler);
\r
- }
\r
-
\r
- //-- void marshal(org.xml.sax.ContentHandler)
\r
+ } //-- void marshal(org.xml.sax.ContentHandler)
\r
\r
/**
\r
* Sets the value of field 'name'.
\r
\r
/**
\r
* Sets the value of field 'name'.
\r
- *
\r
+ *
\r
* @param name the value of field 'name'.
\r
*/
\r
public void setName(java.lang.String name)
\r
{
\r
this._name = name;
\r
* @param name the value of field 'name'.
\r
*/
\r
public void setName(java.lang.String name)
\r
{
\r
this._name = name;
\r
- }
\r
-
\r
- //-- void setName(java.lang.String)
\r
+ } //-- void setName(java.lang.String)
\r
\r
/**
\r
* Sets the value of field 'RGB'.
\r
\r
/**
\r
* Sets the value of field 'RGB'.
\r
- *
\r
+ *
\r
* @param RGB the value of field 'RGB'.
\r
*/
\r
public void setRGB(java.lang.String RGB)
\r
{
\r
this._RGB = RGB;
\r
* @param RGB the value of field 'RGB'.
\r
*/
\r
public void setRGB(java.lang.String RGB)
\r
{
\r
this._RGB = RGB;
\r
- }
\r
-
\r
- //-- void setRGB(java.lang.String)
\r
+ } //-- void setRGB(java.lang.String)
\r
\r
/**
\r
* Method unmarshal
\r
\r
/**
\r
* Method unmarshal
\r
- *
\r
- *
\r
- *
\r
+ *
\r
+ *
\r
+ *
\r
* @param reader
\r
* @return Object
\r
*/
\r
public static java.lang.Object unmarshal(java.io.Reader reader)
\r
* @param reader
\r
* @return Object
\r
*/
\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
+ throws org.exolab.castor.xml.MarshalException, org.exolab.castor.xml.ValidationException
\r
{
\r
{
\r
- return (jalview.binding.Colour) Unmarshaller.unmarshal(jalview.binding.Colour.class,
\r
- reader);
\r
- }
\r
-
\r
- //-- java.lang.Object unmarshal(java.io.Reader)
\r
+ return (jalview.binding.Colour) Unmarshaller.unmarshal(jalview.binding.Colour.class, reader);
\r
+ } //-- java.lang.Object unmarshal(java.io.Reader)
\r
\r
/**
\r
* Method validate
\r
\r
/**
\r
* Method validate
\r
- *
\r
+ *
\r
*/
\r
*/
\r
- public void validate() throws org.exolab.castor.xml.ValidationException
\r
+ public void validate()
\r
+ 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
org.exolab.castor.xml.Validator validator = new org.exolab.castor.xml.Validator();
\r
validator.validate(this);
\r
- }
\r
+ } //-- void validate()
\r
\r
\r
- //-- void validate()
\r
}
\r
}
\r