X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fschemabinding%2Fversion2%2Fdescriptors%2FJSeqDescriptor.java;h=427702deab747d5165c86a9f354d5faa5f44acb2;hb=22d4d2237b099daf76bd1a2ed324763972ed91aa;hp=738d4fcc618ca19c3284d9de22e4f1003729e5a9;hpb=81c0d443543fea0b28237b6e2bd7973517780030;p=jalview.git diff --git a/src/jalview/schemabinding/version2/descriptors/JSeqDescriptor.java b/src/jalview/schemabinding/version2/descriptors/JSeqDescriptor.java index 738d4fc..427702d 100644 --- a/src/jalview/schemabinding/version2/descriptors/JSeqDescriptor.java +++ b/src/jalview/schemabinding/version2/descriptors/JSeqDescriptor.java @@ -193,24 +193,21 @@ public class JSeqDescriptor extends org.exolab.castor.xml.util.XMLClassDescripto } desc.setValidator(fieldValidator); //-- _id - desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(java.lang.Integer.TYPE, "_id", "id", org.exolab.castor.xml.NodeType.Attribute); + desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(java.lang.String.class, "_id", "id", 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 { JSeq target = (JSeq) object; - if (!target.hasId()) { return null; } - return new java.lang.Integer(target.getId()); + return target.getId(); } public void setValue( java.lang.Object object, java.lang.Object value) throws IllegalStateException, IllegalArgumentException { try { JSeq target = (JSeq) object; - // ignore null values for non optional primitives - if (value == null) { return; } - - target.setId( ((java.lang.Integer) value).intValue()); + target.setId( (java.lang.String) value); } catch (java.lang.Exception ex) { throw new IllegalStateException(ex.toString()); } @@ -228,11 +225,10 @@ public class JSeqDescriptor extends org.exolab.castor.xml.util.XMLClassDescripto fieldValidator = new org.exolab.castor.xml.FieldValidator(); fieldValidator.setMinOccurs(1); { //-- 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); //-- _hidden