text colour saved

diff --git a/src/jalview/schemabinding/version2/JGroup.java b/src/jalview/schemabinding/version2/JGroup.java
index f3fe3e9..06eb940 100755 (executable)
--- a/src/jalview/schemabinding/version2/JGroup.java
+++ b/src/jalview/schemabinding/version2/JGroup.java
@@ -126,6 +126,36 @@ public class JGroup implements java.io.Serializable {
     private boolean _has_colourText;\r
 \r
     /**\r
+     * Field _textCol1\r
+     */\r
+    private int _textCol1;\r
+\r
+    /**\r
+     * keeps track of state for field: _textCol1\r
+     */\r
+    private boolean _has_textCol1;\r
+\r
+    /**\r
+     * Field _textCol2\r
+     */\r
+    private int _textCol2;\r
+\r
+    /**\r
+     * keeps track of state for field: _textCol2\r
+     */\r
+    private boolean _has_textCol2;\r
+\r
+    /**\r
+     * Field _textColThreshold\r
+     */\r
+    private int _textColThreshold;\r
+\r
+    /**\r
+     * keeps track of state for field: _textColThreshold\r
+     */\r
+    private boolean _has_textColThreshold;\r
+\r
+    /**\r
      * Field _seqList\r
      */\r
     private java.util.Vector _seqList;\r
@@ -245,6 +275,33 @@ public class JGroup implements java.io.Serializable {
     } //-- void deleteStart() \r
 \r
     /**\r
+     * Method deleteTextCol1\r
+     * \r
+     */\r
+    public void deleteTextCol1()\r
+    {\r
+        this._has_textCol1= false;\r
+    } //-- void deleteTextCol1() \r
+\r
+    /**\r
+     * Method deleteTextCol2\r
+     * \r
+     */\r
+    public void deleteTextCol2()\r
+    {\r
+        this._has_textCol2= false;\r
+    } //-- void deleteTextCol2() \r
+\r
+    /**\r
+     * Method deleteTextColThreshold\r
+     * \r
+     */\r
+    public void deleteTextColThreshold()\r
+    {\r
+        this._has_textColThreshold= false;\r
+    } //-- void deleteTextColThreshold() \r
+\r
+    /**\r
      * Method enumerateSeq\r
      * \r
      * \r
@@ -415,6 +472,39 @@ public class JGroup implements java.io.Serializable {
     } //-- int getStart() \r
 \r
     /**\r
+     * Returns the value of field 'textCol1'.\r
+     * \r
+     * @return int\r
+     * @return the value of field 'textCol1'.\r
+     */\r
+    public int getTextCol1()\r
+    {\r
+        return this._textCol1;\r
+    } //-- int getTextCol1() \r
+\r
+    /**\r
+     * Returns the value of field 'textCol2'.\r
+     * \r
+     * @return int\r
+     * @return the value of field 'textCol2'.\r
+     */\r
+    public int getTextCol2()\r
+    {\r
+        return this._textCol2;\r
+    } //-- int getTextCol2() \r
+\r
+    /**\r
+     * Returns the value of field 'textColThreshold'.\r
+     * \r
+     * @return int\r
+     * @return the value of field 'textColThreshold'.\r
+     */\r
+    public int getTextColThreshold()\r
+    {\r
+        return this._textColThreshold;\r
+    } //-- int getTextColThreshold() \r
+\r
+    /**\r
      * Method hasColourText\r
      * \r
      * \r
@@ -511,6 +601,42 @@ public class JGroup implements java.io.Serializable {
     } //-- boolean hasStart() \r
 \r
     /**\r
+     * Method hasTextCol1\r
+     * \r
+     * \r
+     * \r
+     * @return boolean\r
+     */\r
+    public boolean hasTextCol1()\r
+    {\r
+        return this._has_textCol1;\r
+    } //-- boolean hasTextCol1() \r
+\r
+    /**\r
+     * Method hasTextCol2\r
+     * \r
+     * \r
+     * \r
+     * @return boolean\r
+     */\r
+    public boolean hasTextCol2()\r
+    {\r
+        return this._has_textCol2;\r
+    } //-- boolean hasTextCol2() \r
+\r
+    /**\r
+     * Method hasTextColThreshold\r
+     * \r
+     * \r
+     * \r
+     * @return boolean\r
+     */\r
+    public boolean hasTextColThreshold()\r
+    {\r
+        return this._has_textColThreshold;\r
+    } //-- boolean hasTextColThreshold() \r
+\r
+    /**\r
      * Method isValid\r
      * \r
      * \r
@@ -723,6 +849,39 @@ public class JGroup implements java.io.Serializable {
     } //-- void setStart(int) \r
 \r
     /**\r
+     * Sets the value of field 'textCol1'.\r
+     * \r
+     * @param textCol1 the value of field 'textCol1'.\r
+     */\r
+    public void setTextCol1(int textCol1)\r
+    {\r
+        this._textCol1 = textCol1;\r
+        this._has_textCol1 = true;\r
+    } //-- void setTextCol1(int) \r
+\r
+    /**\r
+     * Sets the value of field 'textCol2'.\r
+     * \r
+     * @param textCol2 the value of field 'textCol2'.\r
+     */\r
+    public void setTextCol2(int textCol2)\r
+    {\r
+        this._textCol2 = textCol2;\r
+        this._has_textCol2 = true;\r
+    } //-- void setTextCol2(int) \r
+\r
+    /**\r
+     * Sets the value of field 'textColThreshold'.\r
+     * \r
+     * @param textColThreshold the value of field 'textColThreshold'\r
+     */\r
+    public void setTextColThreshold(int textColThreshold)\r
+    {\r
+        this._textColThreshold = textColThreshold;\r
+        this._has_textColThreshold = true;\r
+    } //-- void setTextColThreshold(int) \r
+\r
+    /**\r
      * Method unmarshal\r
      * \r
      * \r

diff --git a/src/jalview/schemabinding/version2/JGroupDescriptor.java b/src/jalview/schemabinding/version2/JGroupDescriptor.java
index 231c631..1985c61 100755 (executable)
--- a/src/jalview/schemabinding/version2/JGroupDescriptor.java
+++ b/src/jalview/schemabinding/version2/JGroupDescriptor.java
@@ -465,6 +465,129 @@ public class JGroupDescriptor extends org.exolab.castor.xml.util.XMLClassDescrip
             fieldValidator.setValidator(typeValidator);\r
         }\r
         desc.setValidator(fieldValidator);\r
+        //-- _textCol1\r
+        desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(java.lang.Integer.TYPE, "_textCol1", "textCol1", org.exolab.castor.xml.NodeType.Attribute);\r
+        handler = (new org.exolab.castor.xml.XMLFieldHandler() {\r
+            public java.lang.Object getValue( java.lang.Object object ) \r
+                throws IllegalStateException\r
+            {\r
+                JGroup target = (JGroup) object;\r
+                if(!target.hasTextCol1())\r
+                    return null;\r
+                return new java.lang.Integer(target.getTextCol1());\r
+            }\r
+            public void setValue( java.lang.Object object, java.lang.Object value) \r
+                throws IllegalStateException, IllegalArgumentException\r
+            {\r
+                try {\r
+                    JGroup target = (JGroup) object;\r
+                    // if null, use delete method for optional primitives \r
+                    if (value == null) {\r
+                        target.deleteTextCol1();\r
+                        return;\r
+                    }\r
+                    target.setTextCol1( ((java.lang.Integer)value).intValue());\r
+                }\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
+        addFieldDescriptor(desc);\r
+        \r
+        //-- validation code for: _textCol1\r
+        fieldValidator = new org.exolab.castor.xml.FieldValidator();\r
+        { //-- local scope\r
+            IntegerValidator typeValidator= new IntegerValidator();\r
+            fieldValidator.setValidator(typeValidator);\r
+        }\r
+        desc.setValidator(fieldValidator);\r
+        //-- _textCol2\r
+        desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(java.lang.Integer.TYPE, "_textCol2", "textCol2", org.exolab.castor.xml.NodeType.Attribute);\r
+        handler = (new org.exolab.castor.xml.XMLFieldHandler() {\r
+            public java.lang.Object getValue( java.lang.Object object ) \r
+                throws IllegalStateException\r
+            {\r
+                JGroup target = (JGroup) object;\r
+                if(!target.hasTextCol2())\r
+                    return null;\r
+                return new java.lang.Integer(target.getTextCol2());\r
+            }\r
+            public void setValue( java.lang.Object object, java.lang.Object value) \r
+                throws IllegalStateException, IllegalArgumentException\r
+            {\r
+                try {\r
+                    JGroup target = (JGroup) object;\r
+                    // if null, use delete method for optional primitives \r
+                    if (value == null) {\r
+                        target.deleteTextCol2();\r
+                        return;\r
+                    }\r
+                    target.setTextCol2( ((java.lang.Integer)value).intValue());\r
+                }\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
+        addFieldDescriptor(desc);\r
+        \r
+        //-- validation code for: _textCol2\r
+        fieldValidator = new org.exolab.castor.xml.FieldValidator();\r
+        { //-- local scope\r
+            IntegerValidator typeValidator= new IntegerValidator();\r
+            fieldValidator.setValidator(typeValidator);\r
+        }\r
+        desc.setValidator(fieldValidator);\r
+        //-- _textColThreshold\r
+        desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(java.lang.Integer.TYPE, "_textColThreshold", "textColThreshold", org.exolab.castor.xml.NodeType.Attribute);\r
+        handler = (new org.exolab.castor.xml.XMLFieldHandler() {\r
+            public java.lang.Object getValue( java.lang.Object object ) \r
+                throws IllegalStateException\r
+            {\r
+                JGroup target = (JGroup) object;\r
+                if(!target.hasTextColThreshold())\r
+                    return null;\r
+                return new java.lang.Integer(target.getTextColThreshold());\r
+            }\r
+            public void setValue( java.lang.Object object, java.lang.Object value) \r
+                throws IllegalStateException, IllegalArgumentException\r
+            {\r
+                try {\r
+                    JGroup target = (JGroup) object;\r
+                    // if null, use delete method for optional primitives \r
+                    if (value == null) {\r
+                        target.deleteTextColThreshold();\r
+                        return;\r
+                    }\r
+                    target.setTextColThreshold( ((java.lang.Integer)value).intValue());\r
+                }\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
+        addFieldDescriptor(desc);\r
+        \r
+        //-- validation code for: _textColThreshold\r
+        fieldValidator = new org.exolab.castor.xml.FieldValidator();\r
+        { //-- local scope\r
+            IntegerValidator typeValidator= new IntegerValidator();\r
+            fieldValidator.setValidator(typeValidator);\r
+        }\r
+        desc.setValidator(fieldValidator);\r
         //-- initialize element descriptors\r
         \r
         //-- _seqList\r

diff --git a/src/jalview/schemabinding/version2/Viewport.java b/src/jalview/schemabinding/version2/Viewport.java
index 7562424..db055bf 100755 (executable)
--- a/src/jalview/schemabinding/version2/Viewport.java
+++ b/src/jalview/schemabinding/version2/Viewport.java
@@ -271,6 +271,36 @@ public class Viewport implements java.io.Serializable {
     private boolean _has_gatheredViews;\r
 \r
     /**\r
+     * Field _textCol1\r
+     */\r
+    private int _textCol1;\r
+\r
+    /**\r
+     * keeps track of state for field: _textCol1\r
+     */\r
+    private boolean _has_textCol1;\r
+\r
+    /**\r
+     * Field _textCol2\r
+     */\r
+    private int _textCol2;\r
+\r
+    /**\r
+     * keeps track of state for field: _textCol2\r
+     */\r
+    private boolean _has_textCol2;\r
+\r
+    /**\r
+     * Field _textColThreshold\r
+     */\r
+    private int _textColThreshold;\r
+\r
+    /**\r
+     * keeps track of state for field: _textColThreshold\r
+     */\r
+    private boolean _has_textColThreshold;\r
+\r
+    /**\r
      * Field _annotationColours\r
      */\r
     private jalview.schemabinding.version2.AnnotationColours _annotationColours;\r
@@ -476,6 +506,33 @@ public class Viewport implements java.io.Serializable {
     } //-- void deleteStartSeq() \r
 \r
     /**\r
+     * Method deleteTextCol1\r
+     * \r
+     */\r
+    public void deleteTextCol1()\r
+    {\r
+        this._has_textCol1= false;\r
+    } //-- void deleteTextCol1() \r
+\r
+    /**\r
+     * Method deleteTextCol2\r
+     * \r
+     */\r
+    public void deleteTextCol2()\r
+    {\r
+        this._has_textCol2= false;\r
+    } //-- void deleteTextCol2() \r
+\r
+    /**\r
+     * Method deleteTextColThreshold\r
+     * \r
+     */\r
+    public void deleteTextColThreshold()\r
+    {\r
+        this._has_textColThreshold= false;\r
+    } //-- void deleteTextColThreshold() \r
+\r
+    /**\r
      * Method deleteWidth\r
      * \r
      */\r
@@ -803,6 +860,39 @@ public class Viewport implements java.io.Serializable {
     } //-- int getStartSeq() \r
 \r
     /**\r
+     * Returns the value of field 'textCol1'.\r
+     * \r
+     * @return int\r
+     * @return the value of field 'textCol1'.\r
+     */\r
+    public int getTextCol1()\r
+    {\r
+        return this._textCol1;\r
+    } //-- int getTextCol1() \r
+\r
+    /**\r
+     * Returns the value of field 'textCol2'.\r
+     * \r
+     * @return int\r
+     * @return the value of field 'textCol2'.\r
+     */\r
+    public int getTextCol2()\r
+    {\r
+        return this._textCol2;\r
+    } //-- int getTextCol2() \r
+\r
+    /**\r
+     * Returns the value of field 'textColThreshold'.\r
+     * \r
+     * @return int\r
+     * @return the value of field 'textColThreshold'.\r
+     */\r
+    public int getTextColThreshold()\r
+    {\r
+        return this._textColThreshold;\r
+    } //-- int getTextColThreshold() \r
+\r
+    /**\r
      * Returns the value of field 'title'.\r
      * \r
      * @return String\r
@@ -1073,6 +1163,42 @@ public class Viewport implements java.io.Serializable {
     } //-- boolean hasStartSeq() \r
 \r
     /**\r
+     * Method hasTextCol1\r
+     * \r
+     * \r
+     * \r
+     * @return boolean\r
+     */\r
+    public boolean hasTextCol1()\r
+    {\r
+        return this._has_textCol1;\r
+    } //-- boolean hasTextCol1() \r
+\r
+    /**\r
+     * Method hasTextCol2\r
+     * \r
+     * \r
+     * \r
+     * @return boolean\r
+     */\r
+    public boolean hasTextCol2()\r
+    {\r
+        return this._has_textCol2;\r
+    } //-- boolean hasTextCol2() \r
+\r
+    /**\r
+     * Method hasTextColThreshold\r
+     * \r
+     * \r
+     * \r
+     * @return boolean\r
+     */\r
+    public boolean hasTextColThreshold()\r
+    {\r
+        return this._has_textColThreshold;\r
+    } //-- boolean hasTextColThreshold() \r
+\r
+    /**\r
      * Method hasWidth\r
      * \r
      * \r
@@ -1455,6 +1581,39 @@ public class Viewport implements java.io.Serializable {
     } //-- void setStartSeq(int) \r
 \r
     /**\r
+     * Sets the value of field 'textCol1'.\r
+     * \r
+     * @param textCol1 the value of field 'textCol1'.\r
+     */\r
+    public void setTextCol1(int textCol1)\r
+    {\r
+        this._textCol1 = textCol1;\r
+        this._has_textCol1 = true;\r
+    } //-- void setTextCol1(int) \r
+\r
+    /**\r
+     * Sets the value of field 'textCol2'.\r
+     * \r
+     * @param textCol2 the value of field 'textCol2'.\r
+     */\r
+    public void setTextCol2(int textCol2)\r
+    {\r
+        this._textCol2 = textCol2;\r
+        this._has_textCol2 = true;\r
+    } //-- void setTextCol2(int) \r
+\r
+    /**\r
+     * Sets the value of field 'textColThreshold'.\r
+     * \r
+     * @param textColThreshold the value of field 'textColThreshold'\r
+     */\r
+    public void setTextColThreshold(int textColThreshold)\r
+    {\r
+        this._textColThreshold = textColThreshold;\r
+        this._has_textColThreshold = true;\r
+    } //-- void setTextColThreshold(int) \r
+\r
+    /**\r
      * Sets the value of field 'title'.\r
      * \r
      * @param title the value of field 'title'.\r

diff --git a/src/jalview/schemabinding/version2/ViewportDescriptor.java b/src/jalview/schemabinding/version2/ViewportDescriptor.java
index 00167ad..e32317c 100755 (executable)
--- a/src/jalview/schemabinding/version2/ViewportDescriptor.java
+++ b/src/jalview/schemabinding/version2/ViewportDescriptor.java
@@ -1106,6 +1106,129 @@ public class ViewportDescriptor extends org.exolab.castor.xml.util.XMLClassDescr
             fieldValidator.setValidator(typeValidator);\r
         }\r
         desc.setValidator(fieldValidator);\r
+        //-- _textCol1\r
+        desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(java.lang.Integer.TYPE, "_textCol1", "textCol1", org.exolab.castor.xml.NodeType.Attribute);\r
+        handler = (new org.exolab.castor.xml.XMLFieldHandler() {\r
+            public java.lang.Object getValue( java.lang.Object object ) \r
+                throws IllegalStateException\r
+            {\r
+                Viewport target = (Viewport) object;\r
+                if(!target.hasTextCol1())\r
+                    return null;\r
+                return new java.lang.Integer(target.getTextCol1());\r
+            }\r
+            public void setValue( java.lang.Object object, java.lang.Object value) \r
+                throws IllegalStateException, IllegalArgumentException\r
+            {\r
+                try {\r
+                    Viewport target = (Viewport) object;\r
+                    // if null, use delete method for optional primitives \r
+                    if (value == null) {\r
+                        target.deleteTextCol1();\r
+                        return;\r
+                    }\r
+                    target.setTextCol1( ((java.lang.Integer)value).intValue());\r
+                }\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
+        addFieldDescriptor(desc);\r
+        \r
+        //-- validation code for: _textCol1\r
+        fieldValidator = new org.exolab.castor.xml.FieldValidator();\r
+        { //-- local scope\r
+            IntegerValidator typeValidator= new IntegerValidator();\r
+            fieldValidator.setValidator(typeValidator);\r
+        }\r
+        desc.setValidator(fieldValidator);\r
+        //-- _textCol2\r
+        desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(java.lang.Integer.TYPE, "_textCol2", "textCol2", org.exolab.castor.xml.NodeType.Attribute);\r
+        handler = (new org.exolab.castor.xml.XMLFieldHandler() {\r
+            public java.lang.Object getValue( java.lang.Object object ) \r
+                throws IllegalStateException\r
+            {\r
+                Viewport target = (Viewport) object;\r
+                if(!target.hasTextCol2())\r
+                    return null;\r
+                return new java.lang.Integer(target.getTextCol2());\r
+            }\r
+            public void setValue( java.lang.Object object, java.lang.Object value) \r
+                throws IllegalStateException, IllegalArgumentException\r
+            {\r
+                try {\r
+                    Viewport target = (Viewport) object;\r
+                    // if null, use delete method for optional primitives \r
+                    if (value == null) {\r
+                        target.deleteTextCol2();\r
+                        return;\r
+                    }\r
+                    target.setTextCol2( ((java.lang.Integer)value).intValue());\r
+                }\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
+        addFieldDescriptor(desc);\r
+        \r
+        //-- validation code for: _textCol2\r
+        fieldValidator = new org.exolab.castor.xml.FieldValidator();\r
+        { //-- local scope\r
+            IntegerValidator typeValidator= new IntegerValidator();\r
+            fieldValidator.setValidator(typeValidator);\r
+        }\r
+        desc.setValidator(fieldValidator);\r
+        //-- _textColThreshold\r
+        desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(java.lang.Integer.TYPE, "_textColThreshold", "textColThreshold", org.exolab.castor.xml.NodeType.Attribute);\r
+        handler = (new org.exolab.castor.xml.XMLFieldHandler() {\r
+            public java.lang.Object getValue( java.lang.Object object ) \r
+                throws IllegalStateException\r
+            {\r
+                Viewport target = (Viewport) object;\r
+                if(!target.hasTextColThreshold())\r
+                    return null;\r
+                return new java.lang.Integer(target.getTextColThreshold());\r
+            }\r
+            public void setValue( java.lang.Object object, java.lang.Object value) \r
+                throws IllegalStateException, IllegalArgumentException\r
+            {\r
+                try {\r
+                    Viewport target = (Viewport) object;\r
+                    // if null, use delete method for optional primitives \r
+                    if (value == null) {\r
+                        target.deleteTextColThreshold();\r
+                        return;\r
+                    }\r
+                    target.setTextColThreshold( ((java.lang.Integer)value).intValue());\r
+                }\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
+        addFieldDescriptor(desc);\r
+        \r
+        //-- validation code for: _textColThreshold\r
+        fieldValidator = new org.exolab.castor.xml.FieldValidator();\r
+        { //-- local scope\r
+            IntegerValidator typeValidator= new IntegerValidator();\r
+            fieldValidator.setValidator(typeValidator);\r
+        }\r
+        desc.setValidator(fieldValidator);\r
         //-- initialize element descriptors\r
         \r
         //-- _annotationColours\r