Merge branch 'features/pca_jaxb_datasetrefs_JAL-3171_JAL-3063_JAL-1767' into develop

[jalview.git] / src / jalview / schemabinding / version2 / descriptors / JalviewModelSequenceDescriptor.java

diff --git a/src/jalview/schemabinding/version2/descriptors/JalviewModelSequenceDescriptor.java b/src/jalview/schemabinding/version2/descriptors/JalviewModelSequenceDescriptor.java
index e8c4ef4..af40425 100644 (file)
--- a/src/jalview/schemabinding/version2/descriptors/JalviewModelSequenceDescriptor.java
+++ b/src/jalview/schemabinding/version2/descriptors/JalviewModelSequenceDescriptor.java
@@ -18,8 +18,8 @@ import jalview.schemabinding.version2.JalviewModelSequence;
  * 
  * @version $Revision$ $Date$
  */
-public class JalviewModelSequenceDescriptor extends
-        org.exolab.castor.xml.util.XMLClassDescriptorImpl
+public class JalviewModelSequenceDescriptor
+        extends org.exolab.castor.xml.util.XMLClassDescriptorImpl
 {
 
   // --------------------------/
@@ -91,8 +91,8 @@ public class JalviewModelSequenceDescriptor extends
         }
       }
 
-      public void resetValue(Object object) throws IllegalStateException,
-              IllegalArgumentException
+      public void resetValue(Object object)
+              throws IllegalStateException, IllegalArgumentException
       {
         try
         {
@@ -146,8 +146,8 @@ public class JalviewModelSequenceDescriptor extends
         }
       }
 
-      public void resetValue(Object object) throws IllegalStateException,
-              IllegalArgumentException
+      public void resetValue(Object object)
+              throws IllegalStateException, IllegalArgumentException
       {
         try
         {
@@ -194,15 +194,16 @@ public class JalviewModelSequenceDescriptor extends
         try
         {
           JalviewModelSequence target = (JalviewModelSequence) object;
-          target.addViewport((jalview.schemabinding.version2.Viewport) value);
+          target.addViewport(
+                  (jalview.schemabinding.version2.Viewport) value);
         } catch (java.lang.Exception ex)
         {
           throw new IllegalStateException(ex.toString());
         }
       }
 
-      public void resetValue(Object object) throws IllegalStateException,
-              IllegalArgumentException
+      public void resetValue(Object object)
+              throws IllegalStateException, IllegalArgumentException
       {
         try
         {
@@ -250,15 +251,16 @@ public class JalviewModelSequenceDescriptor extends
         try
         {
           JalviewModelSequence target = (JalviewModelSequence) object;
-          target.addUserColours((jalview.schemabinding.version2.UserColours) value);
+          target.addUserColours(
+                  (jalview.schemabinding.version2.UserColours) value);
         } catch (java.lang.Exception ex)
         {
           throw new IllegalStateException(ex.toString());
         }
       }
 
-      public void resetValue(Object object) throws IllegalStateException,
-              IllegalArgumentException
+      public void resetValue(Object object)
+              throws IllegalStateException, IllegalArgumentException
       {
         try
         {
@@ -312,8 +314,8 @@ public class JalviewModelSequenceDescriptor extends
         }
       }
 
-      public void resetValue(Object object) throws IllegalStateException,
-              IllegalArgumentException
+      public void resetValue(Object object)
+              throws IllegalStateException, IllegalArgumentException
       {
         try
         {
@@ -341,6 +343,63 @@ public class JalviewModelSequenceDescriptor extends
     { // -- local scope
     }
     desc.setValidator(fieldValidator);
+    // -- _pcaViewerList
+    desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(
+            jalview.schemabinding.version2.PcaViewer.class,
+            "_pcaViewerList", "PcaViewer",
+            org.exolab.castor.xml.NodeType.Element);
+    handler = new org.exolab.castor.xml.XMLFieldHandler()
+    {
+      public java.lang.Object getValue(java.lang.Object object)
+              throws IllegalStateException
+      {
+        JalviewModelSequence target = (JalviewModelSequence) object;
+        return target.getPcaViewer();
+      }
+
+      public void setValue(java.lang.Object object, java.lang.Object value)
+              throws IllegalStateException, IllegalArgumentException
+      {
+        try
+        {
+          JalviewModelSequence target = (JalviewModelSequence) object;
+          target.addPcaViewer(
+                  (jalview.schemabinding.version2.PcaViewer) value);
+        } catch (java.lang.Exception ex)
+        {
+          throw new IllegalStateException(ex.toString());
+        }
+      }
+
+      public void resetValue(Object object)
+              throws IllegalStateException, IllegalArgumentException
+      {
+        try
+        {
+          JalviewModelSequence target = (JalviewModelSequence) object;
+          target.removeAllPcaViewer();
+        } catch (java.lang.Exception ex)
+        {
+          throw new IllegalStateException(ex.toString());
+        }
+      }
+
+      public java.lang.Object newInstance(java.lang.Object parent)
+      {
+        return new jalview.schemabinding.version2.PcaViewer();
+      }
+    };
+    desc.setHandler(handler);
+    desc.setNameSpaceURI("www.jalview.org");
+    desc.setMultivalued(true);
+    addFieldDescriptor(desc);
+
+    // -- validation code for: _pcaViewerList
+    fieldValidator = new org.exolab.castor.xml.FieldValidator();
+    fieldValidator.setMinOccurs(0);
+    { // -- local scope
+    }
+    desc.setValidator(fieldValidator);
     // -- _featureSettings
     desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(
             jalview.schemabinding.version2.FeatureSettings.class,
@@ -361,7 +420,8 @@ public class JalviewModelSequenceDescriptor extends
         try
         {
           JalviewModelSequence target = (JalviewModelSequence) object;
-          target.setFeatureSettings((jalview.schemabinding.version2.FeatureSettings) value);
+          target.setFeatureSettings(
+                  (jalview.schemabinding.version2.FeatureSettings) value);
         } catch (java.lang.Exception ex)
         {
           throw new IllegalStateException(ex.toString());