extended Colour element with additional optional attributes for graduated colour

[jalview.git] / src / jalview / schemabinding / version2 / descriptors / JalviewUserColoursDescriptor.java

diff --git a/src/jalview/schemabinding/version2/descriptors/JalviewUserColoursDescriptor.java b/src/jalview/schemabinding/version2/descriptors/JalviewUserColoursDescriptor.java
index 78d08bd..8a23ca5 100644 (file)
--- a/src/jalview/schemabinding/version2/descriptors/JalviewUserColoursDescriptor.java
+++ b/src/jalview/schemabinding/version2/descriptors/JalviewUserColoursDescriptor.java
@@ -1,5 +1,5 @@
 /*\r
- * Jalview - A Sequence Alignment Editor and Viewer (Development Version 2.4.1)\r
+ * Jalview - A Sequence Alignment Editor and Viewer (Version 2.4.1)\r
  * Copyright (C) 2009 AM Waterhouse, J Procter, G Barton, M Clamp, S Searle\r
  * \r
  * This program is free software; you can redistribute it and/or\r
@@ -22,8 +22,8 @@ package jalview.schemabinding.version2.descriptors;
  //- Imported classes and packages -/\r
 //---------------------------------/\r
 \r
-import jalview.schemabinding.version2.Colour;\r
 import jalview.schemabinding.version2.JalviewUserColours;\r
+import jalview.schemabinding.version2.Colour;\r
 \r
 /**\r
  * Class JalviewUserColoursDescriptor.\r
@@ -114,6 +114,43 @@ public class JalviewUserColoursDescriptor extends org.exolab.castor.xml.util.XML
         desc.setValidator(fieldValidator);\r
         //-- initialize element descriptors\r
         \r
+        //-- _version\r
+        desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(java.lang.String.class, "_version", "Version", org.exolab.castor.xml.NodeType.Element);\r
+        desc.setImmutable(true);\r
+        handler = new org.exolab.castor.xml.XMLFieldHandler() {\r
+            public java.lang.Object getValue( java.lang.Object object ) \r
+                throws IllegalStateException\r
+            {\r
+                JalviewUserColours target = (JalviewUserColours) object;\r
+                return target.getVersion();\r
+            }\r
+            public void setValue( java.lang.Object object, java.lang.Object value) \r
+                throws IllegalStateException, IllegalArgumentException\r
+            {\r
+                try {\r
+                    JalviewUserColours target = (JalviewUserColours) object;\r
+                    target.setVersion( (java.lang.String) value);\r
+                } catch (java.lang.Exception ex) {\r
+                    throw new IllegalStateException(ex.toString());\r
+                }\r
+            }\r
+            public java.lang.Object newInstance(java.lang.Object parent) {\r
+                return null;\r
+            }\r
+        };\r
+        desc.setHandler(handler);\r
+        desc.setMultivalued(false);\r
+        addFieldDescriptor(desc);\r
+        \r
+        //-- validation code for: _version\r
+        fieldValidator = new org.exolab.castor.xml.FieldValidator();\r
+        { //-- local scope\r
+            org.exolab.castor.xml.validators.StringValidator typeValidator;\r
+            typeValidator = new org.exolab.castor.xml.validators.StringValidator();\r
+            fieldValidator.setValidator(typeValidator);\r
+            typeValidator.setWhiteSpace("preserve");\r
+        }\r
+        desc.setValidator(fieldValidator);\r
         //-- _colourList\r
         desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(Colour.class, "_colourList", "colour", org.exolab.castor.xml.NodeType.Element);\r
         handler = new org.exolab.castor.xml.XMLFieldHandler() {\r
@@ -146,13 +183,12 @@ public class JalviewUserColoursDescriptor extends org.exolab.castor.xml.util.XML
             }\r
         };\r
         desc.setHandler(handler);\r
-        desc.setRequired(true);\r
         desc.setMultivalued(true);\r
         addFieldDescriptor(desc);\r
         \r
         //-- validation code for: _colourList\r
         fieldValidator = new org.exolab.castor.xml.FieldValidator();\r
-        fieldValidator.setMinOccurs(1);\r
+        fieldValidator.setMinOccurs(0);\r
         { //-- local scope\r
         }\r
         desc.setValidator(fieldValidator);\r