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
Merge branch 'develop' into features/JAL-2446NCList
[jalview.git]
/
src
/
jalview
/
binding
/
Colour.java
diff --git
a/src/jalview/binding/Colour.java
b/src/jalview/binding/Colour.java
index
c1de152
..
25cf9bf
100644
(file)
--- a/
src/jalview/binding/Colour.java
+++ b/
src/jalview/binding/Colour.java
@@
-475,12
+475,13
@@
public class Colour implements java.io.Serializable
* if this object is an invalid instance according to the schema
* @return the unmarshaled jalview.binding.Colour
*/
* if this object is an invalid instance according to the schema
* @return the unmarshaled jalview.binding.Colour
*/
- public static jalview.binding.Colour unmarshal(final java.io.Reader reader)
+ public static jalview.binding.Colour unmarshal(
+ final 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);
+ return (jalview.binding.Colour) Unmarshaller
+ .unmarshal(jalview.binding.Colour.class, reader);
}
/**
}
/**