X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fschemabinding%2Fversion2%2Fdescriptors%2FTreeDescriptor.java;h=5beffc172079692e09181ddb58ef76fe50b041b8;hb=be893de63f21e1ac9a4a13429820e7483deaed48;hp=ed9952e4ce9b48b0274c68d2c09e4391cd28199b;hpb=13ae48dd55af238e2c25e957c5feb5a858d7e90e;p=jalview.git diff --git a/src/jalview/schemabinding/version2/descriptors/TreeDescriptor.java b/src/jalview/schemabinding/version2/descriptors/TreeDescriptor.java index ed9952e..5beffc1 100644 --- a/src/jalview/schemabinding/version2/descriptors/TreeDescriptor.java +++ b/src/jalview/schemabinding/version2/descriptors/TreeDescriptor.java @@ -63,27 +63,22 @@ public class TreeDescriptor extends org.exolab.castor.xml.util.XMLClassDescripto org.exolab.castor.xml.FieldValidator fieldValidator = null; //-- initialize attribute descriptors - //-- _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 { Tree target = (Tree) 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 { Tree target = (Tree) 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()); } @@ -96,25 +91,24 @@ public class TreeDescriptor extends org.exolab.castor.xml.util.XMLClassDescripto 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 { Tree target = (Tree) 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 @@ -123,10 +117,10 @@ public class TreeDescriptor extends org.exolab.castor.xml.util.XMLClassDescripto Tree target = (Tree) 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()); } @@ -139,7 +133,7 @@ public class TreeDescriptor extends org.exolab.castor.xml.util.XMLClassDescripto 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; @@ -149,15 +143,15 @@ public class TreeDescriptor extends org.exolab.castor.xml.util.XMLClassDescripto typeValidator.setMaxInclusive(2147483647); } desc.setValidator(fieldValidator); - //-- _xpos - desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(java.lang.Integer.TYPE, "_xpos", "xpos", 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 { Tree target = (Tree) object; - if (!target.hasXpos()) { return null; } - return new java.lang.Integer(target.getXpos()); + 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 @@ -166,10 +160,10 @@ public class TreeDescriptor extends org.exolab.castor.xml.util.XMLClassDescripto Tree target = (Tree) object; // if null, use delete method for optional primitives if (value == null) { - target.deleteXpos(); + target.deleteFontStyle(); return; } - target.setXpos( ((java.lang.Integer) value).intValue()); + target.setFontStyle( ((java.lang.Integer) value).intValue()); } catch (java.lang.Exception ex) { throw new IllegalStateException(ex.toString()); } @@ -182,7 +176,7 @@ public class TreeDescriptor extends org.exolab.castor.xml.util.XMLClassDescripto desc.setMultivalued(false); addFieldDescriptor(desc); - //-- validation code for: _xpos + //-- validation code for: _fontStyle fieldValidator = new org.exolab.castor.xml.FieldValidator(); { //-- local scope org.exolab.castor.xml.validators.IntValidator typeValidator; @@ -192,15 +186,15 @@ public class TreeDescriptor extends org.exolab.castor.xml.util.XMLClassDescripto 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); + //-- _threshold + desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(java.lang.Float.TYPE, "_threshold", "threshold", org.exolab.castor.xml.NodeType.Attribute); handler = new org.exolab.castor.xml.XMLFieldHandler() { public java.lang.Object getValue( java.lang.Object object ) throws IllegalStateException { Tree target = (Tree) object; - if (!target.hasYpos()) { return null; } - return new java.lang.Integer(target.getYpos()); + if (!target.hasThreshold()) { return null; } + return new java.lang.Float(target.getThreshold()); } public void setValue( java.lang.Object object, java.lang.Object value) throws IllegalStateException, IllegalArgumentException @@ -209,10 +203,10 @@ public class TreeDescriptor extends org.exolab.castor.xml.util.XMLClassDescripto Tree target = (Tree) object; // if null, use delete method for optional primitives if (value == null) { - target.deleteYpos(); + target.deleteThreshold(); return; } - target.setYpos( ((java.lang.Integer) value).intValue()); + target.setThreshold( ((java.lang.Float) value).floatValue()); } catch (java.lang.Exception ex) { throw new IllegalStateException(ex.toString()); } @@ -225,32 +219,37 @@ public class TreeDescriptor extends org.exolab.castor.xml.util.XMLClassDescripto desc.setMultivalued(false); addFieldDescriptor(desc); - //-- validation code for: _ypos + //-- validation code for: _threshold 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.FloatValidator typeValidator; + typeValidator = new org.exolab.castor.xml.validators.FloatValidator(); fieldValidator.setValidator(typeValidator); - typeValidator.setMinInclusive(-2147483648); - typeValidator.setMaxInclusive(2147483647); + typeValidator.setMinInclusive((float) -3.4028235E38); + typeValidator.setMaxInclusive((float) 3.4028235E38); } desc.setValidator(fieldValidator); - //-- _fontName - desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(java.lang.String.class, "_fontName", "fontName", org.exolab.castor.xml.NodeType.Attribute); - desc.setImmutable(true); + //-- _showBootstrap + desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(java.lang.Boolean.TYPE, "_showBootstrap", "showBootstrap", org.exolab.castor.xml.NodeType.Attribute); handler = new org.exolab.castor.xml.XMLFieldHandler() { public java.lang.Object getValue( java.lang.Object object ) throws IllegalStateException { Tree target = (Tree) object; - return target.getFontName(); + if (!target.hasShowBootstrap()) { return null; } + return (target.getShowBootstrap() ? java.lang.Boolean.TRUE : java.lang.Boolean.FALSE); } public void setValue( java.lang.Object object, java.lang.Object value) throws IllegalStateException, IllegalArgumentException { try { Tree target = (Tree) object; - target.setFontName( (java.lang.String) value); + // if null, use delete method for optional primitives + if (value == null) { + target.deleteShowBootstrap(); + return; + } + target.setShowBootstrap( ((java.lang.Boolean) value).booleanValue()); } catch (java.lang.Exception ex) { throw new IllegalStateException(ex.toString()); } @@ -263,24 +262,23 @@ public class TreeDescriptor extends org.exolab.castor.xml.util.XMLClassDescripto desc.setMultivalued(false); addFieldDescriptor(desc); - //-- validation code for: _fontName + //-- validation code for: _showBootstrap 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.BooleanValidator typeValidator; + typeValidator = new org.exolab.castor.xml.validators.BooleanValidator(); fieldValidator.setValidator(typeValidator); - 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); + //-- _showDistances + desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(java.lang.Boolean.TYPE, "_showDistances", "showDistances", org.exolab.castor.xml.NodeType.Attribute); handler = new org.exolab.castor.xml.XMLFieldHandler() { public java.lang.Object getValue( java.lang.Object object ) throws IllegalStateException { Tree target = (Tree) object; - if (!target.hasFontSize()) { return null; } - return new java.lang.Integer(target.getFontSize()); + if (!target.hasShowDistances()) { return null; } + return (target.getShowDistances() ? java.lang.Boolean.TRUE : java.lang.Boolean.FALSE); } public void setValue( java.lang.Object object, java.lang.Object value) throws IllegalStateException, IllegalArgumentException @@ -289,10 +287,10 @@ public class TreeDescriptor extends org.exolab.castor.xml.util.XMLClassDescripto Tree target = (Tree) object; // if null, use delete method for optional primitives if (value == null) { - target.deleteFontSize(); + target.deleteShowDistances(); return; } - target.setFontSize( ((java.lang.Integer) value).intValue()); + target.setShowDistances( ((java.lang.Boolean) value).booleanValue()); } catch (java.lang.Exception ex) { throw new IllegalStateException(ex.toString()); } @@ -305,25 +303,23 @@ public class TreeDescriptor extends org.exolab.castor.xml.util.XMLClassDescripto desc.setMultivalued(false); addFieldDescriptor(desc); - //-- validation code for: _fontSize + //-- validation code for: _showDistances 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); + //-- _markUnlinked + desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(java.lang.Boolean.TYPE, "_markUnlinked", "markUnlinked", org.exolab.castor.xml.NodeType.Attribute); handler = new org.exolab.castor.xml.XMLFieldHandler() { public java.lang.Object getValue( java.lang.Object object ) throws IllegalStateException { Tree target = (Tree) object; - if (!target.hasFontStyle()) { return null; } - return new java.lang.Integer(target.getFontStyle()); + if (!target.hasMarkUnlinked()) { return null; } + return (target.getMarkUnlinked() ? java.lang.Boolean.TRUE : java.lang.Boolean.FALSE); } public void setValue( java.lang.Object object, java.lang.Object value) throws IllegalStateException, IllegalArgumentException @@ -332,10 +328,10 @@ public class TreeDescriptor extends org.exolab.castor.xml.util.XMLClassDescripto Tree target = (Tree) object; // if null, use delete method for optional primitives if (value == null) { - target.deleteFontStyle(); + target.deleteMarkUnlinked(); return; } - target.setFontStyle( ((java.lang.Integer) value).intValue()); + target.setMarkUnlinked( ((java.lang.Boolean) value).booleanValue()); } catch (java.lang.Exception ex) { throw new IllegalStateException(ex.toString()); } @@ -348,25 +344,23 @@ public class TreeDescriptor extends org.exolab.castor.xml.util.XMLClassDescripto desc.setMultivalued(false); addFieldDescriptor(desc); - //-- validation code for: _fontStyle + //-- validation code for: _markUnlinked 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); - //-- _threshold - desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(java.lang.Float.TYPE, "_threshold", "threshold", org.exolab.castor.xml.NodeType.Attribute); + //-- _fitToWindow + desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(java.lang.Boolean.TYPE, "_fitToWindow", "fitToWindow", org.exolab.castor.xml.NodeType.Attribute); handler = new org.exolab.castor.xml.XMLFieldHandler() { public java.lang.Object getValue( java.lang.Object object ) throws IllegalStateException { Tree target = (Tree) object; - if (!target.hasThreshold()) { return null; } - return new java.lang.Float(target.getThreshold()); + if (!target.hasFitToWindow()) { return null; } + return (target.getFitToWindow() ? java.lang.Boolean.TRUE : java.lang.Boolean.FALSE); } public void setValue( java.lang.Object object, java.lang.Object value) throws IllegalStateException, IllegalArgumentException @@ -375,10 +369,10 @@ public class TreeDescriptor extends org.exolab.castor.xml.util.XMLClassDescripto Tree target = (Tree) object; // if null, use delete method for optional primitives if (value == null) { - target.deleteThreshold(); + target.deleteFitToWindow(); return; } - target.setThreshold( ((java.lang.Float) value).floatValue()); + target.setFitToWindow( ((java.lang.Boolean) value).booleanValue()); } catch (java.lang.Exception ex) { throw new IllegalStateException(ex.toString()); } @@ -391,25 +385,23 @@ public class TreeDescriptor extends org.exolab.castor.xml.util.XMLClassDescripto desc.setMultivalued(false); addFieldDescriptor(desc); - //-- validation code for: _threshold + //-- validation code for: _fitToWindow fieldValidator = new org.exolab.castor.xml.FieldValidator(); { //-- local scope - org.exolab.castor.xml.validators.FloatValidator typeValidator; - typeValidator = new org.exolab.castor.xml.validators.FloatValidator(); + org.exolab.castor.xml.validators.BooleanValidator typeValidator; + typeValidator = new org.exolab.castor.xml.validators.BooleanValidator(); fieldValidator.setValidator(typeValidator); - typeValidator.setMinInclusive((float) -3.4028235E38); - typeValidator.setMaxInclusive((float) 3.4028235E38); } desc.setValidator(fieldValidator); - //-- _showBootstrap - desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(java.lang.Boolean.TYPE, "_showBootstrap", "showBootstrap", org.exolab.castor.xml.NodeType.Attribute); + //-- _currentTree + desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(java.lang.Boolean.TYPE, "_currentTree", "currentTree", org.exolab.castor.xml.NodeType.Attribute); handler = new org.exolab.castor.xml.XMLFieldHandler() { public java.lang.Object getValue( java.lang.Object object ) throws IllegalStateException { Tree target = (Tree) object; - if (!target.hasShowBootstrap()) { return null; } - return (target.getShowBootstrap() ? java.lang.Boolean.TRUE : java.lang.Boolean.FALSE); + if (!target.hasCurrentTree()) { return null; } + return (target.getCurrentTree() ? java.lang.Boolean.TRUE : java.lang.Boolean.FALSE); } public void setValue( java.lang.Object object, java.lang.Object value) throws IllegalStateException, IllegalArgumentException @@ -418,10 +410,10 @@ public class TreeDescriptor extends org.exolab.castor.xml.util.XMLClassDescripto Tree target = (Tree) object; // if null, use delete method for optional primitives if (value == null) { - target.deleteShowBootstrap(); + target.deleteCurrentTree(); return; } - target.setShowBootstrap( ((java.lang.Boolean) value).booleanValue()); + target.setCurrentTree( ((java.lang.Boolean) value).booleanValue()); } catch (java.lang.Exception ex) { throw new IllegalStateException(ex.toString()); } @@ -434,7 +426,7 @@ public class TreeDescriptor extends org.exolab.castor.xml.util.XMLClassDescripto desc.setMultivalued(false); addFieldDescriptor(desc); - //-- validation code for: _showBootstrap + //-- validation code for: _currentTree fieldValidator = new org.exolab.castor.xml.FieldValidator(); { //-- local scope org.exolab.castor.xml.validators.BooleanValidator typeValidator; @@ -442,56 +434,51 @@ public class TreeDescriptor extends org.exolab.castor.xml.util.XMLClassDescripto fieldValidator.setValidator(typeValidator); } desc.setValidator(fieldValidator); - //-- _showDistances - desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(java.lang.Boolean.TYPE, "_showDistances", "showDistances", 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 { Tree target = (Tree) object; - if (!target.hasShowDistances()) { return null; } - return (target.getShowDistances() ? 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 { Tree target = (Tree) object; - // if null, use delete method for optional primitives - if (value == null) { - target.deleteShowDistances(); - return; - } - target.setShowDistances( ((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: _showDistances + //-- 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); - //-- _markUnlinked - desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(java.lang.Boolean.TYPE, "_markUnlinked", "markUnlinked", 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 { Tree target = (Tree) object; - if (!target.hasMarkUnlinked()) { return null; } - return (target.getMarkUnlinked() ? java.lang.Boolean.TRUE : java.lang.Boolean.FALSE); + 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 @@ -500,10 +487,10 @@ public class TreeDescriptor extends org.exolab.castor.xml.util.XMLClassDescripto Tree target = (Tree) object; // if null, use delete method for optional primitives if (value == null) { - target.deleteMarkUnlinked(); + target.deleteWidth(); return; } - target.setMarkUnlinked( ((java.lang.Boolean) value).booleanValue()); + target.setWidth( ((java.lang.Integer) value).intValue()); } catch (java.lang.Exception ex) { throw new IllegalStateException(ex.toString()); } @@ -516,23 +503,25 @@ public class TreeDescriptor extends org.exolab.castor.xml.util.XMLClassDescripto desc.setMultivalued(false); addFieldDescriptor(desc); - //-- validation code for: _markUnlinked + //-- validation code for: _width 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.IntValidator typeValidator; + typeValidator = new org.exolab.castor.xml.validators.IntValidator(); fieldValidator.setValidator(typeValidator); + typeValidator.setMinInclusive(-2147483648); + typeValidator.setMaxInclusive(2147483647); } desc.setValidator(fieldValidator); - //-- _fitToWindow - desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(java.lang.Boolean.TYPE, "_fitToWindow", "fitToWindow", 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 { Tree target = (Tree) object; - if (!target.hasFitToWindow()) { return null; } - return (target.getFitToWindow() ? java.lang.Boolean.TRUE : java.lang.Boolean.FALSE); + 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 @@ -541,10 +530,10 @@ public class TreeDescriptor extends org.exolab.castor.xml.util.XMLClassDescripto Tree target = (Tree) object; // if null, use delete method for optional primitives if (value == null) { - target.deleteFitToWindow(); + target.deleteHeight(); return; } - target.setFitToWindow( ((java.lang.Boolean) value).booleanValue()); + target.setHeight( ((java.lang.Integer) value).intValue()); } catch (java.lang.Exception ex) { throw new IllegalStateException(ex.toString()); } @@ -557,23 +546,25 @@ public class TreeDescriptor extends org.exolab.castor.xml.util.XMLClassDescripto desc.setMultivalued(false); addFieldDescriptor(desc); - //-- validation code for: _fitToWindow + //-- validation code for: _height 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.IntValidator typeValidator; + typeValidator = new org.exolab.castor.xml.validators.IntValidator(); fieldValidator.setValidator(typeValidator); + typeValidator.setMinInclusive(-2147483648); + typeValidator.setMaxInclusive(2147483647); } desc.setValidator(fieldValidator); - //-- _currentTree - desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(java.lang.Boolean.TYPE, "_currentTree", "currentTree", 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 { Tree target = (Tree) object; - if (!target.hasCurrentTree()) { return null; } - return (target.getCurrentTree() ? java.lang.Boolean.TRUE : java.lang.Boolean.FALSE); + 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 @@ -582,10 +573,10 @@ public class TreeDescriptor extends org.exolab.castor.xml.util.XMLClassDescripto Tree target = (Tree) object; // if null, use delete method for optional primitives if (value == null) { - target.deleteCurrentTree(); + target.deleteXpos(); return; } - target.setCurrentTree( ((java.lang.Boolean) value).booleanValue()); + target.setXpos( ((java.lang.Integer) value).intValue()); } catch (java.lang.Exception ex) { throw new IllegalStateException(ex.toString()); } @@ -598,48 +589,57 @@ public class TreeDescriptor extends org.exolab.castor.xml.util.XMLClassDescripto desc.setMultivalued(false); addFieldDescriptor(desc); - //-- validation code for: _currentTree + //-- validation code for: _xpos 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.IntValidator typeValidator; + typeValidator = new org.exolab.castor.xml.validators.IntValidator(); fieldValidator.setValidator(typeValidator); + typeValidator.setMinInclusive(-2147483648); + 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 { Tree target = (Tree) 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 { Tree target = (Tree) 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