fixed a slight bug in AppData entry searching, and introduced generic AppData entry...

[vamsas.git] / src / org / vamsas / objects / core / AnnotationElementDescriptor.java

diff --git a/src/org/vamsas/objects/core/AnnotationElementDescriptor.java b/src/org/vamsas/objects/core/AnnotationElementDescriptor.java
index 9bc3e57..943bb99 100644 (file)
--- a/src/org/vamsas/objects/core/AnnotationElementDescriptor.java
+++ b/src/org/vamsas/objects/core/AnnotationElementDescriptor.java
@@ -104,7 +104,7 @@ public class AnnotationElementDescriptor extends org.exolab.castor.xml.util.XMLC
         fieldValidator = new org.exolab.castor.xml.FieldValidator();
         fieldValidator.setMinOccurs(1);
         { //-- local scope
-            IntegerValidator typeValidator= new IntegerValidator();
+            IntegerValidator typeValidator = new IntegerValidator();
             fieldValidator.setValidator(typeValidator);
         }
         desc.setValidator(fieldValidator);
@@ -171,13 +171,11 @@ public class AnnotationElementDescriptor extends org.exolab.castor.xml.util.XMLC
         };
         desc.setHandler(handler);
         desc.setNameSpaceURI("http://www.vamsas.org");
-        desc.setRequired(true);
         desc.setMultivalued(false);
         addFieldDescriptor(desc);
         
         //-- validation code for: _displayCharacter
         fieldValidator = new org.exolab.castor.xml.FieldValidator();
-        fieldValidator.setMinOccurs(1);
         { //-- local scope
             StringValidator typeValidator = new StringValidator();
             typeValidator.setWhiteSpace("preserve");
@@ -211,13 +209,11 @@ public class AnnotationElementDescriptor extends org.exolab.castor.xml.util.XMLC
         };
         desc.setHandler(handler);
         desc.setNameSpaceURI("http://www.vamsas.org");
-        desc.setRequired(true);
         desc.setMultivalued(false);
         addFieldDescriptor(desc);
         
         //-- validation code for: _description
         fieldValidator = new org.exolab.castor.xml.FieldValidator();
-        fieldValidator.setMinOccurs(1);
         { //-- local scope
             StringValidator typeValidator = new StringValidator();
             typeValidator.setWhiteSpace("preserve");
@@ -251,13 +247,11 @@ public class AnnotationElementDescriptor extends org.exolab.castor.xml.util.XMLC
         };
         desc.setHandler(handler);
         desc.setNameSpaceURI("http://www.vamsas.org");
-        desc.setRequired(true);
         desc.setMultivalued(false);
         addFieldDescriptor(desc);
         
         //-- validation code for: _secondaryStructure
         fieldValidator = new org.exolab.castor.xml.FieldValidator();
-        fieldValidator.setMinOccurs(1);
         { //-- local scope
             StringValidator typeValidator = new StringValidator();
             typeValidator.setLength(1);
@@ -281,9 +275,11 @@ public class AnnotationElementDescriptor extends org.exolab.castor.xml.util.XMLC
             {
                 try {
                     AnnotationElement target = (AnnotationElement) object;
-                    // ignore null values for non optional primitives
-                    if (value == null) return;
-                    
+                    // if null, use delete method for optional primitives 
+                    if (value == null) {
+                        target.deleteValue();
+                        return;
+                    }
                     target.setValue( ((java.lang.Float)value).floatValue());
                 }
                 catch (java.lang.Exception ex) {
@@ -296,13 +292,11 @@ public class AnnotationElementDescriptor extends org.exolab.castor.xml.util.XMLC
         };
         desc.setHandler(handler);
         desc.setNameSpaceURI("http://www.vamsas.org");
-        desc.setRequired(true);
         desc.setMultivalued(false);
         addFieldDescriptor(desc);
         
         //-- validation code for: _value
         fieldValidator = new org.exolab.castor.xml.FieldValidator();
-        fieldValidator.setMinOccurs(1);
         { //-- local scope
             FloatValidator typeValidator = new FloatValidator();
             fieldValidator.setValidator(typeValidator);