X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fschemabinding%2Fversion2%2Fdescriptors%2FViewportDescriptor.java;h=13ad9f7b2e4042e25f888cd6bfe751f1ecd2adce;hb=190a4893d444dde29d9bc2c825b483491fa0088d;hp=ed50a68891a86135740afee0793a00d12c251533;hpb=13ae48dd55af238e2c25e957c5feb5a858d7e90e;p=jalview.git

diff --git a/src/jalview/schemabinding/version2/descriptors/ViewportDescriptor.java b/src/jalview/schemabinding/version2/descriptors/ViewportDescriptor.java
index ed50a68..13ad9f7 100644
--- a/src/jalview/schemabinding/version2/descriptors/ViewportDescriptor.java
+++ b/src/jalview/schemabinding/version2/descriptors/ViewportDescriptor.java
@@ -1,3 +1,20 @@
+/*******************************************************************************
+ * Jalview - A Sequence Alignment Editor and Viewer (Version 2.7)
+ * Copyright (C) 2011 J Procter, AM Waterhouse, G Barton, M Clamp, S Searle
+ *
+ * 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/>.
+ *******************************************************************************/
 /*
  * This class was automatically generated with 
  * <a href="http://www.castor.org">Castor 1.1</a>, using an XML
@@ -1125,15 +1142,15 @@ public class ViewportDescriptor extends org.exolab.castor.xml.util.XMLClassDescr
             fieldValidator.setValidator(typeValidator);
         }
         desc.setValidator(fieldValidator);
-        //-- _xpos
-        desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(java.lang.Integer.TYPE, "_xpos", "xpos", org.exolab.castor.xml.NodeType.Attribute);
+        //-- _startRes
+        desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(java.lang.Integer.TYPE, "_startRes", "startRes", org.exolab.castor.xml.NodeType.Attribute);
         handler = new org.exolab.castor.xml.XMLFieldHandler() {
             public java.lang.Object getValue( java.lang.Object object ) 
                 throws IllegalStateException
             {
                 Viewport target = (Viewport) object;
-                if (!target.hasXpos()) { return null; }
-                return new java.lang.Integer(target.getXpos());
+                if (!target.hasStartRes()) { return null; }
+                return new java.lang.Integer(target.getStartRes());
             }
             public void setValue( java.lang.Object object, java.lang.Object value) 
                 throws IllegalStateException, IllegalArgumentException
@@ -1142,10 +1159,10 @@ public class ViewportDescriptor extends org.exolab.castor.xml.util.XMLClassDescr
                     Viewport target = (Viewport) object;
                     // if null, use delete method for optional primitives 
                     if (value == null) {
-                        target.deleteXpos();
+                        target.deleteStartRes();
                         return;
                     }
-                    target.setXpos( ((java.lang.Integer) value).intValue());
+                    target.setStartRes( ((java.lang.Integer) value).intValue());
                 } catch (java.lang.Exception ex) {
                     throw new IllegalStateException(ex.toString());
                 }
@@ -1158,7 +1175,7 @@ public class ViewportDescriptor extends org.exolab.castor.xml.util.XMLClassDescr
         desc.setMultivalued(false);
         addFieldDescriptor(desc);
         
-        //-- validation code for: _xpos
+        //-- validation code for: _startRes
         fieldValidator = new org.exolab.castor.xml.FieldValidator();
         { //-- local scope
             org.exolab.castor.xml.validators.IntValidator typeValidator;
@@ -1168,15 +1185,15 @@ public class ViewportDescriptor extends org.exolab.castor.xml.util.XMLClassDescr
             typeValidator.setMaxInclusive(2147483647);
         }
         desc.setValidator(fieldValidator);
-        //-- _ypos
-        desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(java.lang.Integer.TYPE, "_ypos", "ypos", org.exolab.castor.xml.NodeType.Attribute);
+        //-- _startSeq
+        desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(java.lang.Integer.TYPE, "_startSeq", "startSeq", org.exolab.castor.xml.NodeType.Attribute);
         handler = new org.exolab.castor.xml.XMLFieldHandler() {
             public java.lang.Object getValue( java.lang.Object object ) 
                 throws IllegalStateException
             {
                 Viewport target = (Viewport) object;
-                if (!target.hasYpos()) { return null; }
-                return new java.lang.Integer(target.getYpos());
+                if (!target.hasStartSeq()) { return null; }
+                return new java.lang.Integer(target.getStartSeq());
             }
             public void setValue( java.lang.Object object, java.lang.Object value) 
                 throws IllegalStateException, IllegalArgumentException
@@ -1185,10 +1202,10 @@ public class ViewportDescriptor extends org.exolab.castor.xml.util.XMLClassDescr
                     Viewport target = (Viewport) object;
                     // if null, use delete method for optional primitives 
                     if (value == null) {
-                        target.deleteYpos();
+                        target.deleteStartSeq();
                         return;
                     }
-                    target.setYpos( ((java.lang.Integer) value).intValue());
+                    target.setStartSeq( ((java.lang.Integer) value).intValue());
                 } catch (java.lang.Exception ex) {
                     throw new IllegalStateException(ex.toString());
                 }
@@ -1201,7 +1218,7 @@ public class ViewportDescriptor extends org.exolab.castor.xml.util.XMLClassDescr
         desc.setMultivalued(false);
         addFieldDescriptor(desc);
         
-        //-- validation code for: _ypos
+        //-- validation code for: _startSeq
         fieldValidator = new org.exolab.castor.xml.FieldValidator();
         { //-- local scope
             org.exolab.castor.xml.validators.IntValidator typeValidator;
@@ -1211,27 +1228,22 @@ public class ViewportDescriptor extends org.exolab.castor.xml.util.XMLClassDescr
             typeValidator.setMaxInclusive(2147483647);
         }
         desc.setValidator(fieldValidator);
-        //-- _width
-        desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(java.lang.Integer.TYPE, "_width", "width", org.exolab.castor.xml.NodeType.Attribute);
+        //-- _fontName
+        desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(java.lang.String.class, "_fontName", "fontName", org.exolab.castor.xml.NodeType.Attribute);
+        desc.setImmutable(true);
         handler = new org.exolab.castor.xml.XMLFieldHandler() {
             public java.lang.Object getValue( java.lang.Object object ) 
                 throws IllegalStateException
             {
                 Viewport target = (Viewport) object;
-                if (!target.hasWidth()) { return null; }
-                return new java.lang.Integer(target.getWidth());
+                return target.getFontName();
             }
             public void setValue( java.lang.Object object, java.lang.Object value) 
                 throws IllegalStateException, IllegalArgumentException
             {
                 try {
                     Viewport target = (Viewport) object;
-                    // if null, use delete method for optional primitives 
-                    if (value == null) {
-                        target.deleteWidth();
-                        return;
-                    }
-                    target.setWidth( ((java.lang.Integer) value).intValue());
+                    target.setFontName( (java.lang.String) value);
                 } catch (java.lang.Exception ex) {
                     throw new IllegalStateException(ex.toString());
                 }
@@ -1244,25 +1256,24 @@ public class ViewportDescriptor extends org.exolab.castor.xml.util.XMLClassDescr
         desc.setMultivalued(false);
         addFieldDescriptor(desc);
         
-        //-- validation code for: _width
+        //-- validation code for: _fontName
         fieldValidator = new org.exolab.castor.xml.FieldValidator();
         { //-- local scope
-            org.exolab.castor.xml.validators.IntValidator typeValidator;
-            typeValidator = new org.exolab.castor.xml.validators.IntValidator();
+            org.exolab.castor.xml.validators.StringValidator typeValidator;
+            typeValidator = new org.exolab.castor.xml.validators.StringValidator();
             fieldValidator.setValidator(typeValidator);
-            typeValidator.setMinInclusive(-2147483648);
-            typeValidator.setMaxInclusive(2147483647);
+            typeValidator.setWhiteSpace("preserve");
         }
         desc.setValidator(fieldValidator);
-        //-- _height
-        desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(java.lang.Integer.TYPE, "_height", "height", org.exolab.castor.xml.NodeType.Attribute);
+        //-- _fontSize
+        desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(java.lang.Integer.TYPE, "_fontSize", "fontSize", org.exolab.castor.xml.NodeType.Attribute);
         handler = new org.exolab.castor.xml.XMLFieldHandler() {
             public java.lang.Object getValue( java.lang.Object object ) 
                 throws IllegalStateException
             {
                 Viewport target = (Viewport) object;
-                if (!target.hasHeight()) { return null; }
-                return new java.lang.Integer(target.getHeight());
+                if (!target.hasFontSize()) { return null; }
+                return new java.lang.Integer(target.getFontSize());
             }
             public void setValue( java.lang.Object object, java.lang.Object value) 
                 throws IllegalStateException, IllegalArgumentException
@@ -1271,10 +1282,10 @@ public class ViewportDescriptor extends org.exolab.castor.xml.util.XMLClassDescr
                     Viewport target = (Viewport) object;
                     // if null, use delete method for optional primitives 
                     if (value == null) {
-                        target.deleteHeight();
+                        target.deleteFontSize();
                         return;
                     }
-                    target.setHeight( ((java.lang.Integer) value).intValue());
+                    target.setFontSize( ((java.lang.Integer) value).intValue());
                 } catch (java.lang.Exception ex) {
                     throw new IllegalStateException(ex.toString());
                 }
@@ -1287,7 +1298,7 @@ public class ViewportDescriptor extends org.exolab.castor.xml.util.XMLClassDescr
         desc.setMultivalued(false);
         addFieldDescriptor(desc);
         
-        //-- validation code for: _height
+        //-- validation code for: _fontSize
         fieldValidator = new org.exolab.castor.xml.FieldValidator();
         { //-- local scope
             org.exolab.castor.xml.validators.IntValidator typeValidator;
@@ -1297,15 +1308,15 @@ public class ViewportDescriptor extends org.exolab.castor.xml.util.XMLClassDescr
             typeValidator.setMaxInclusive(2147483647);
         }
         desc.setValidator(fieldValidator);
-        //-- _startRes
-        desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(java.lang.Integer.TYPE, "_startRes", "startRes", org.exolab.castor.xml.NodeType.Attribute);
+        //-- _fontStyle
+        desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(java.lang.Integer.TYPE, "_fontStyle", "fontStyle", org.exolab.castor.xml.NodeType.Attribute);
         handler = new org.exolab.castor.xml.XMLFieldHandler() {
             public java.lang.Object getValue( java.lang.Object object ) 
                 throws IllegalStateException
             {
                 Viewport target = (Viewport) object;
-                if (!target.hasStartRes()) { return null; }
-                return new java.lang.Integer(target.getStartRes());
+                if (!target.hasFontStyle()) { return null; }
+                return new java.lang.Integer(target.getFontStyle());
             }
             public void setValue( java.lang.Object object, java.lang.Object value) 
                 throws IllegalStateException, IllegalArgumentException
@@ -1314,10 +1325,10 @@ public class ViewportDescriptor extends org.exolab.castor.xml.util.XMLClassDescr
                     Viewport target = (Viewport) object;
                     // if null, use delete method for optional primitives 
                     if (value == null) {
-                        target.deleteStartRes();
+                        target.deleteFontStyle();
                         return;
                     }
-                    target.setStartRes( ((java.lang.Integer) value).intValue());
+                    target.setFontStyle( ((java.lang.Integer) value).intValue());
                 } catch (java.lang.Exception ex) {
                     throw new IllegalStateException(ex.toString());
                 }
@@ -1330,7 +1341,7 @@ public class ViewportDescriptor extends org.exolab.castor.xml.util.XMLClassDescr
         desc.setMultivalued(false);
         addFieldDescriptor(desc);
         
-        //-- validation code for: _startRes
+        //-- validation code for: _fontStyle
         fieldValidator = new org.exolab.castor.xml.FieldValidator();
         { //-- local scope
             org.exolab.castor.xml.validators.IntValidator typeValidator;
@@ -1340,27 +1351,22 @@ public class ViewportDescriptor extends org.exolab.castor.xml.util.XMLClassDescr
             typeValidator.setMaxInclusive(2147483647);
         }
         desc.setValidator(fieldValidator);
-        //-- _startSeq
-        desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(java.lang.Integer.TYPE, "_startSeq", "startSeq", org.exolab.castor.xml.NodeType.Attribute);
+        //-- _viewName
+        desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(java.lang.String.class, "_viewName", "viewName", org.exolab.castor.xml.NodeType.Attribute);
+        desc.setImmutable(true);
         handler = new org.exolab.castor.xml.XMLFieldHandler() {
             public java.lang.Object getValue( java.lang.Object object ) 
                 throws IllegalStateException
             {
                 Viewport target = (Viewport) object;
-                if (!target.hasStartSeq()) { return null; }
-                return new java.lang.Integer(target.getStartSeq());
+                return target.getViewName();
             }
             public void setValue( java.lang.Object object, java.lang.Object value) 
                 throws IllegalStateException, IllegalArgumentException
             {
                 try {
                     Viewport target = (Viewport) object;
-                    // if null, use delete method for optional primitives 
-                    if (value == null) {
-                        target.deleteStartSeq();
-                        return;
-                    }
-                    target.setStartSeq( ((java.lang.Integer) value).intValue());
+                    target.setViewName( (java.lang.String) value);
                 } catch (java.lang.Exception ex) {
                     throw new IllegalStateException(ex.toString());
                 }
@@ -1373,32 +1379,31 @@ public class ViewportDescriptor extends org.exolab.castor.xml.util.XMLClassDescr
         desc.setMultivalued(false);
         addFieldDescriptor(desc);
         
-        //-- validation code for: _startSeq
+        //-- validation code for: _viewName
         fieldValidator = new org.exolab.castor.xml.FieldValidator();
         { //-- local scope
-            org.exolab.castor.xml.validators.IntValidator typeValidator;
-            typeValidator = new org.exolab.castor.xml.validators.IntValidator();
+            org.exolab.castor.xml.validators.StringValidator typeValidator;
+            typeValidator = new org.exolab.castor.xml.validators.StringValidator();
             fieldValidator.setValidator(typeValidator);
-            typeValidator.setMinInclusive(-2147483648);
-            typeValidator.setMaxInclusive(2147483647);
+            typeValidator.setWhiteSpace("preserve");
         }
         desc.setValidator(fieldValidator);
-        //-- _fontName
-        desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(java.lang.String.class, "_fontName", "fontName", org.exolab.castor.xml.NodeType.Attribute);
+        //-- _sequenceSetId
+        desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(java.lang.String.class, "_sequenceSetId", "sequenceSetId", org.exolab.castor.xml.NodeType.Attribute);
         desc.setImmutable(true);
         handler = new org.exolab.castor.xml.XMLFieldHandler() {
             public java.lang.Object getValue( java.lang.Object object ) 
                 throws IllegalStateException
             {
                 Viewport target = (Viewport) object;
-                return target.getFontName();
+                return target.getSequenceSetId();
             }
             public void setValue( java.lang.Object object, java.lang.Object value) 
                 throws IllegalStateException, IllegalArgumentException
             {
                 try {
                     Viewport target = (Viewport) object;
-                    target.setFontName( (java.lang.String) value);
+                    target.setSequenceSetId( (java.lang.String) value);
                 } catch (java.lang.Exception ex) {
                     throw new IllegalStateException(ex.toString());
                 }
@@ -1411,7 +1416,7 @@ public class ViewportDescriptor extends org.exolab.castor.xml.util.XMLClassDescr
         desc.setMultivalued(false);
         addFieldDescriptor(desc);
         
-        //-- validation code for: _fontName
+        //-- validation code for: _sequenceSetId
         fieldValidator = new org.exolab.castor.xml.FieldValidator();
         { //-- local scope
             org.exolab.castor.xml.validators.StringValidator typeValidator;
@@ -1420,15 +1425,15 @@ public class ViewportDescriptor extends org.exolab.castor.xml.util.XMLClassDescr
             typeValidator.setWhiteSpace("preserve");
         }
         desc.setValidator(fieldValidator);
-        //-- _fontSize
-        desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(java.lang.Integer.TYPE, "_fontSize", "fontSize", org.exolab.castor.xml.NodeType.Attribute);
+        //-- _gatheredViews
+        desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(java.lang.Boolean.TYPE, "_gatheredViews", "gatheredViews", org.exolab.castor.xml.NodeType.Attribute);
         handler = new org.exolab.castor.xml.XMLFieldHandler() {
             public java.lang.Object getValue( java.lang.Object object ) 
                 throws IllegalStateException
             {
                 Viewport target = (Viewport) object;
-                if (!target.hasFontSize()) { return null; }
-                return new java.lang.Integer(target.getFontSize());
+                if (!target.hasGatheredViews()) { return null; }
+                return (target.getGatheredViews() ? java.lang.Boolean.TRUE : java.lang.Boolean.FALSE);
             }
             public void setValue( java.lang.Object object, java.lang.Object value) 
                 throws IllegalStateException, IllegalArgumentException
@@ -1437,10 +1442,10 @@ public class ViewportDescriptor extends org.exolab.castor.xml.util.XMLClassDescr
                     Viewport target = (Viewport) object;
                     // if null, use delete method for optional primitives 
                     if (value == null) {
-                        target.deleteFontSize();
+                        target.deleteGatheredViews();
                         return;
                     }
-                    target.setFontSize( ((java.lang.Integer) value).intValue());
+                    target.setGatheredViews( ((java.lang.Boolean) value).booleanValue());
                 } catch (java.lang.Exception ex) {
                     throw new IllegalStateException(ex.toString());
                 }
@@ -1453,25 +1458,23 @@ public class ViewportDescriptor extends org.exolab.castor.xml.util.XMLClassDescr
         desc.setMultivalued(false);
         addFieldDescriptor(desc);
         
-        //-- validation code for: _fontSize
+        //-- validation code for: _gatheredViews
         fieldValidator = new org.exolab.castor.xml.FieldValidator();
         { //-- local scope
-            org.exolab.castor.xml.validators.IntValidator typeValidator;
-            typeValidator = new org.exolab.castor.xml.validators.IntValidator();
+            org.exolab.castor.xml.validators.BooleanValidator typeValidator;
+            typeValidator = new org.exolab.castor.xml.validators.BooleanValidator();
             fieldValidator.setValidator(typeValidator);
-            typeValidator.setMinInclusive(-2147483648);
-            typeValidator.setMaxInclusive(2147483647);
         }
         desc.setValidator(fieldValidator);
-        //-- _fontStyle
-        desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(java.lang.Integer.TYPE, "_fontStyle", "fontStyle", org.exolab.castor.xml.NodeType.Attribute);
+        //-- _textCol1
+        desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(java.lang.Integer.TYPE, "_textCol1", "textCol1", org.exolab.castor.xml.NodeType.Attribute);
         handler = new org.exolab.castor.xml.XMLFieldHandler() {
             public java.lang.Object getValue( java.lang.Object object ) 
                 throws IllegalStateException
             {
                 Viewport target = (Viewport) object;
-                if (!target.hasFontStyle()) { return null; }
-                return new java.lang.Integer(target.getFontStyle());
+                if (!target.hasTextCol1()) { return null; }
+                return new java.lang.Integer(target.getTextCol1());
             }
             public void setValue( java.lang.Object object, java.lang.Object value) 
                 throws IllegalStateException, IllegalArgumentException
@@ -1480,10 +1483,10 @@ public class ViewportDescriptor extends org.exolab.castor.xml.util.XMLClassDescr
                     Viewport target = (Viewport) object;
                     // if null, use delete method for optional primitives 
                     if (value == null) {
-                        target.deleteFontStyle();
+                        target.deleteTextCol1();
                         return;
                     }
-                    target.setFontStyle( ((java.lang.Integer) value).intValue());
+                    target.setTextCol1( ((java.lang.Integer) value).intValue());
                 } catch (java.lang.Exception ex) {
                     throw new IllegalStateException(ex.toString());
                 }
@@ -1496,7 +1499,7 @@ public class ViewportDescriptor extends org.exolab.castor.xml.util.XMLClassDescr
         desc.setMultivalued(false);
         addFieldDescriptor(desc);
         
-        //-- validation code for: _fontStyle
+        //-- validation code for: _textCol1
         fieldValidator = new org.exolab.castor.xml.FieldValidator();
         { //-- local scope
             org.exolab.castor.xml.validators.IntValidator typeValidator;
@@ -1506,22 +1509,27 @@ public class ViewportDescriptor extends org.exolab.castor.xml.util.XMLClassDescr
             typeValidator.setMaxInclusive(2147483647);
         }
         desc.setValidator(fieldValidator);
-        //-- _viewName
-        desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(java.lang.String.class, "_viewName", "viewName", org.exolab.castor.xml.NodeType.Attribute);
-        desc.setImmutable(true);
+        //-- _textCol2
+        desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(java.lang.Integer.TYPE, "_textCol2", "textCol2", org.exolab.castor.xml.NodeType.Attribute);
         handler = new org.exolab.castor.xml.XMLFieldHandler() {
             public java.lang.Object getValue( java.lang.Object object ) 
                 throws IllegalStateException
             {
                 Viewport target = (Viewport) object;
-                return target.getViewName();
+                if (!target.hasTextCol2()) { return null; }
+                return new java.lang.Integer(target.getTextCol2());
             }
             public void setValue( java.lang.Object object, java.lang.Object value) 
                 throws IllegalStateException, IllegalArgumentException
             {
                 try {
                     Viewport target = (Viewport) object;
-                    target.setViewName( (java.lang.String) value);
+                    // if null, use delete method for optional primitives 
+                    if (value == null) {
+                        target.deleteTextCol2();
+                        return;
+                    }
+                    target.setTextCol2( ((java.lang.Integer) value).intValue());
                 } catch (java.lang.Exception ex) {
                     throw new IllegalStateException(ex.toString());
                 }
@@ -1534,31 +1542,37 @@ public class ViewportDescriptor extends org.exolab.castor.xml.util.XMLClassDescr
         desc.setMultivalued(false);
         addFieldDescriptor(desc);
         
-        //-- validation code for: _viewName
+        //-- validation code for: _textCol2
         fieldValidator = new org.exolab.castor.xml.FieldValidator();
         { //-- local scope
-            org.exolab.castor.xml.validators.StringValidator typeValidator;
-            typeValidator = new org.exolab.castor.xml.validators.StringValidator();
+            org.exolab.castor.xml.validators.IntValidator typeValidator;
+            typeValidator = new org.exolab.castor.xml.validators.IntValidator();
             fieldValidator.setValidator(typeValidator);
-            typeValidator.setWhiteSpace("preserve");
+            typeValidator.setMinInclusive(-2147483648);
+            typeValidator.setMaxInclusive(2147483647);
         }
         desc.setValidator(fieldValidator);
-        //-- _sequenceSetId
-        desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(java.lang.String.class, "_sequenceSetId", "sequenceSetId", org.exolab.castor.xml.NodeType.Attribute);
-        desc.setImmutable(true);
+        //-- _textColThreshold
+        desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(java.lang.Integer.TYPE, "_textColThreshold", "textColThreshold", org.exolab.castor.xml.NodeType.Attribute);
         handler = new org.exolab.castor.xml.XMLFieldHandler() {
             public java.lang.Object getValue( java.lang.Object object ) 
                 throws IllegalStateException
             {
                 Viewport target = (Viewport) object;
-                return target.getSequenceSetId();
+                if (!target.hasTextColThreshold()) { return null; }
+                return new java.lang.Integer(target.getTextColThreshold());
             }
             public void setValue( java.lang.Object object, java.lang.Object value) 
                 throws IllegalStateException, IllegalArgumentException
             {
                 try {
                     Viewport target = (Viewport) object;
-                    target.setSequenceSetId( (java.lang.String) value);
+                    // if null, use delete method for optional primitives 
+                    if (value == null) {
+                        target.deleteTextColThreshold();
+                        return;
+                    }
+                    target.setTextColThreshold( ((java.lang.Integer) value).intValue());
                 } catch (java.lang.Exception ex) {
                     throw new IllegalStateException(ex.toString());
                 }
@@ -1571,65 +1585,61 @@ public class ViewportDescriptor extends org.exolab.castor.xml.util.XMLClassDescr
         desc.setMultivalued(false);
         addFieldDescriptor(desc);
         
-        //-- validation code for: _sequenceSetId
+        //-- validation code for: _textColThreshold
         fieldValidator = new org.exolab.castor.xml.FieldValidator();
         { //-- local scope
-            org.exolab.castor.xml.validators.StringValidator typeValidator;
-            typeValidator = new org.exolab.castor.xml.validators.StringValidator();
+            org.exolab.castor.xml.validators.IntValidator typeValidator;
+            typeValidator = new org.exolab.castor.xml.validators.IntValidator();
             fieldValidator.setValidator(typeValidator);
-            typeValidator.setWhiteSpace("preserve");
+            typeValidator.setMinInclusive(-2147483648);
+            typeValidator.setMaxInclusive(2147483647);
         }
         desc.setValidator(fieldValidator);
-        //-- _gatheredViews
-        desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(java.lang.Boolean.TYPE, "_gatheredViews", "gatheredViews", org.exolab.castor.xml.NodeType.Attribute);
+        //-- _id
+        desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(java.lang.String.class, "_id", "id", org.exolab.castor.xml.NodeType.Attribute);
+        super.setIdentity(desc);
         handler = new org.exolab.castor.xml.XMLFieldHandler() {
             public java.lang.Object getValue( java.lang.Object object ) 
                 throws IllegalStateException
             {
                 Viewport target = (Viewport) object;
-                if (!target.hasGatheredViews()) { return null; }
-                return (target.getGatheredViews() ? java.lang.Boolean.TRUE : java.lang.Boolean.FALSE);
+                return target.getId();
             }
             public void setValue( java.lang.Object object, java.lang.Object value) 
                 throws IllegalStateException, IllegalArgumentException
             {
                 try {
                     Viewport target = (Viewport) object;
-                    // if null, use delete method for optional primitives 
-                    if (value == null) {
-                        target.deleteGatheredViews();
-                        return;
-                    }
-                    target.setGatheredViews( ((java.lang.Boolean) value).booleanValue());
+                    target.setId( (java.lang.String) value);
                 } catch (java.lang.Exception ex) {
                     throw new IllegalStateException(ex.toString());
                 }
             }
             public java.lang.Object newInstance(java.lang.Object parent) {
-                return null;
+                return new java.lang.String();
             }
         };
         desc.setHandler(handler);
         desc.setMultivalued(false);
         addFieldDescriptor(desc);
         
-        //-- validation code for: _gatheredViews
+        //-- validation code for: _id
         fieldValidator = new org.exolab.castor.xml.FieldValidator();
         { //-- local scope
-            org.exolab.castor.xml.validators.BooleanValidator typeValidator;
-            typeValidator = new org.exolab.castor.xml.validators.BooleanValidator();
+            org.exolab.castor.xml.validators.IdValidator typeValidator;
+            typeValidator = new org.exolab.castor.xml.validators.IdValidator();
             fieldValidator.setValidator(typeValidator);
         }
         desc.setValidator(fieldValidator);
-        //-- _textCol1
-        desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(java.lang.Integer.TYPE, "_textCol1", "textCol1", org.exolab.castor.xml.NodeType.Attribute);
+        //-- _width
+        desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(java.lang.Integer.TYPE, "_width", "width", org.exolab.castor.xml.NodeType.Attribute);
         handler = new org.exolab.castor.xml.XMLFieldHandler() {
             public java.lang.Object getValue( java.lang.Object object ) 
                 throws IllegalStateException
             {
                 Viewport target = (Viewport) object;
-                if (!target.hasTextCol1()) { return null; }
-                return new java.lang.Integer(target.getTextCol1());
+                if (!target.hasWidth()) { return null; }
+                return new java.lang.Integer(target.getWidth());
             }
             public void setValue( java.lang.Object object, java.lang.Object value) 
                 throws IllegalStateException, IllegalArgumentException
@@ -1638,10 +1648,10 @@ public class ViewportDescriptor extends org.exolab.castor.xml.util.XMLClassDescr
                     Viewport target = (Viewport) object;
                     // if null, use delete method for optional primitives 
                     if (value == null) {
-                        target.deleteTextCol1();
+                        target.deleteWidth();
                         return;
                     }
-                    target.setTextCol1( ((java.lang.Integer) value).intValue());
+                    target.setWidth( ((java.lang.Integer) value).intValue());
                 } catch (java.lang.Exception ex) {
                     throw new IllegalStateException(ex.toString());
                 }
@@ -1654,7 +1664,7 @@ public class ViewportDescriptor extends org.exolab.castor.xml.util.XMLClassDescr
         desc.setMultivalued(false);
         addFieldDescriptor(desc);
         
-        //-- validation code for: _textCol1
+        //-- validation code for: _width
         fieldValidator = new org.exolab.castor.xml.FieldValidator();
         { //-- local scope
             org.exolab.castor.xml.validators.IntValidator typeValidator;
@@ -1664,15 +1674,15 @@ public class ViewportDescriptor extends org.exolab.castor.xml.util.XMLClassDescr
             typeValidator.setMaxInclusive(2147483647);
         }
         desc.setValidator(fieldValidator);
-        //-- _textCol2
-        desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(java.lang.Integer.TYPE, "_textCol2", "textCol2", org.exolab.castor.xml.NodeType.Attribute);
+        //-- _height
+        desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(java.lang.Integer.TYPE, "_height", "height", org.exolab.castor.xml.NodeType.Attribute);
         handler = new org.exolab.castor.xml.XMLFieldHandler() {
             public java.lang.Object getValue( java.lang.Object object ) 
                 throws IllegalStateException
             {
                 Viewport target = (Viewport) object;
-                if (!target.hasTextCol2()) { return null; }
-                return new java.lang.Integer(target.getTextCol2());
+                if (!target.hasHeight()) { return null; }
+                return new java.lang.Integer(target.getHeight());
             }
             public void setValue( java.lang.Object object, java.lang.Object value) 
                 throws IllegalStateException, IllegalArgumentException
@@ -1681,10 +1691,10 @@ public class ViewportDescriptor extends org.exolab.castor.xml.util.XMLClassDescr
                     Viewport target = (Viewport) object;
                     // if null, use delete method for optional primitives 
                     if (value == null) {
-                        target.deleteTextCol2();
+                        target.deleteHeight();
                         return;
                     }
-                    target.setTextCol2( ((java.lang.Integer) value).intValue());
+                    target.setHeight( ((java.lang.Integer) value).intValue());
                 } catch (java.lang.Exception ex) {
                     throw new IllegalStateException(ex.toString());
                 }
@@ -1697,7 +1707,7 @@ public class ViewportDescriptor extends org.exolab.castor.xml.util.XMLClassDescr
         desc.setMultivalued(false);
         addFieldDescriptor(desc);
         
-        //-- validation code for: _textCol2
+        //-- validation code for: _height
         fieldValidator = new org.exolab.castor.xml.FieldValidator();
         { //-- local scope
             org.exolab.castor.xml.validators.IntValidator typeValidator;
@@ -1707,15 +1717,15 @@ public class ViewportDescriptor extends org.exolab.castor.xml.util.XMLClassDescr
             typeValidator.setMaxInclusive(2147483647);
         }
         desc.setValidator(fieldValidator);
-        //-- _textColThreshold
-        desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(java.lang.Integer.TYPE, "_textColThreshold", "textColThreshold", org.exolab.castor.xml.NodeType.Attribute);
+        //-- _xpos
+        desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(java.lang.Integer.TYPE, "_xpos", "xpos", org.exolab.castor.xml.NodeType.Attribute);
         handler = new org.exolab.castor.xml.XMLFieldHandler() {
             public java.lang.Object getValue( java.lang.Object object ) 
                 throws IllegalStateException
             {
                 Viewport target = (Viewport) object;
-                if (!target.hasTextColThreshold()) { return null; }
-                return new java.lang.Integer(target.getTextColThreshold());
+                if (!target.hasXpos()) { return null; }
+                return new java.lang.Integer(target.getXpos());
             }
             public void setValue( java.lang.Object object, java.lang.Object value) 
                 throws IllegalStateException, IllegalArgumentException
@@ -1724,10 +1734,10 @@ public class ViewportDescriptor extends org.exolab.castor.xml.util.XMLClassDescr
                     Viewport target = (Viewport) object;
                     // if null, use delete method for optional primitives 
                     if (value == null) {
-                        target.deleteTextColThreshold();
+                        target.deleteXpos();
                         return;
                     }
-                    target.setTextColThreshold( ((java.lang.Integer) value).intValue());
+                    target.setXpos( ((java.lang.Integer) value).intValue());
                 } catch (java.lang.Exception ex) {
                     throw new IllegalStateException(ex.toString());
                 }
@@ -1740,7 +1750,7 @@ public class ViewportDescriptor extends org.exolab.castor.xml.util.XMLClassDescr
         desc.setMultivalued(false);
         addFieldDescriptor(desc);
         
-        //-- validation code for: _textColThreshold
+        //-- validation code for: _xpos
         fieldValidator = new org.exolab.castor.xml.FieldValidator();
         { //-- local scope
             org.exolab.castor.xml.validators.IntValidator typeValidator;
@@ -1750,40 +1760,47 @@ public class ViewportDescriptor extends org.exolab.castor.xml.util.XMLClassDescr
             typeValidator.setMaxInclusive(2147483647);
         }
         desc.setValidator(fieldValidator);
-        //-- _id
-        desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(java.lang.String.class, "_id", "id", org.exolab.castor.xml.NodeType.Attribute);
-        super.setIdentity(desc);
+        //-- _ypos
+        desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(java.lang.Integer.TYPE, "_ypos", "ypos", org.exolab.castor.xml.NodeType.Attribute);
         handler = new org.exolab.castor.xml.XMLFieldHandler() {
             public java.lang.Object getValue( java.lang.Object object ) 
                 throws IllegalStateException
             {
                 Viewport target = (Viewport) object;
-                return target.getId();
+                if (!target.hasYpos()) { return null; }
+                return new java.lang.Integer(target.getYpos());
             }
             public void setValue( java.lang.Object object, java.lang.Object value) 
                 throws IllegalStateException, IllegalArgumentException
             {
                 try {
                     Viewport target = (Viewport) object;
-                    target.setId( (java.lang.String) value);
+                    // if null, use delete method for optional primitives 
+                    if (value == null) {
+                        target.deleteYpos();
+                        return;
+                    }
+                    target.setYpos( ((java.lang.Integer) value).intValue());
                 } catch (java.lang.Exception ex) {
                     throw new IllegalStateException(ex.toString());
                 }
             }
             public java.lang.Object newInstance(java.lang.Object parent) {
-                return new java.lang.String();
+                return null;
             }
         };
         desc.setHandler(handler);
         desc.setMultivalued(false);
         addFieldDescriptor(desc);
         
-        //-- validation code for: _id
+        //-- validation code for: _ypos
         fieldValidator = new org.exolab.castor.xml.FieldValidator();
         { //-- local scope
-            org.exolab.castor.xml.validators.IdValidator typeValidator;
-            typeValidator = new org.exolab.castor.xml.validators.IdValidator();
+            org.exolab.castor.xml.validators.IntValidator typeValidator;
+            typeValidator = new org.exolab.castor.xml.validators.IntValidator();
             fieldValidator.setValidator(typeValidator);
+            typeValidator.setMinInclusive(-2147483648);
+            typeValidator.setMaxInclusive(2147483647);
         }
         desc.setValidator(fieldValidator);
         //-- initialize element descriptors