JAL-1767 scheme DoubleMatrix type includes D and E vectors (optional)

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

diff --git a/src/jalview/schemabinding/version2/descriptors/PcaDataTypeDescriptor.java b/src/jalview/schemabinding/version2/descriptors/PcaDataTypeDescriptor.java
index f864feb..49ad090 100644 (file)
--- a/src/jalview/schemabinding/version2/descriptors/PcaDataTypeDescriptor.java
+++ b/src/jalview/schemabinding/version2/descriptors/PcaDataTypeDescriptor.java
@@ -156,96 +156,6 @@ public class PcaDataTypeDescriptor
     { // -- local scope
     }
     desc.setValidator(fieldValidator);
-    // -- _tridiagonalD
-    desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(
-            jalview.schemabinding.version2.TridiagonalD.class,
-            "_tridiagonalD", "tridiagonalD",
-            org.exolab.castor.xml.NodeType.Element);
-    handler = new org.exolab.castor.xml.XMLFieldHandler()
-    {
-      public java.lang.Object getValue(java.lang.Object object)
-              throws IllegalStateException
-      {
-        PcaDataType target = (PcaDataType) object;
-        return target.getTridiagonalD();
-      }
-
-      public void setValue(java.lang.Object object, java.lang.Object value)
-              throws IllegalStateException, IllegalArgumentException
-      {
-        try
-        {
-          PcaDataType target = (PcaDataType) object;
-          target.setTridiagonalD(
-                  (jalview.schemabinding.version2.TridiagonalD) value);
-        } catch (java.lang.Exception ex)
-        {
-          throw new IllegalStateException(ex.toString());
-        }
-      }
-
-      public java.lang.Object newInstance(java.lang.Object parent)
-      {
-        return new jalview.schemabinding.version2.TridiagonalD();
-      }
-    };
-    desc.setHandler(handler);
-    desc.setNameSpaceURI("www.jalview.org");
-    desc.setRequired(true);
-    desc.setMultivalued(false);
-    addFieldDescriptor(desc);
-
-    // -- validation code for: _tridiagonalD
-    fieldValidator = new org.exolab.castor.xml.FieldValidator();
-    fieldValidator.setMinOccurs(1);
-    { // -- local scope
-    }
-    desc.setValidator(fieldValidator);
-    // -- _tridiagonalE
-    desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(
-            jalview.schemabinding.version2.TridiagonalE.class,
-            "_tridiagonalE", "tridiagonalE",
-            org.exolab.castor.xml.NodeType.Element);
-    handler = new org.exolab.castor.xml.XMLFieldHandler()
-    {
-      public java.lang.Object getValue(java.lang.Object object)
-              throws IllegalStateException
-      {
-        PcaDataType target = (PcaDataType) object;
-        return target.getTridiagonalE();
-      }
-
-      public void setValue(java.lang.Object object, java.lang.Object value)
-              throws IllegalStateException, IllegalArgumentException
-      {
-        try
-        {
-          PcaDataType target = (PcaDataType) object;
-          target.setTridiagonalE(
-                  (jalview.schemabinding.version2.TridiagonalE) value);
-        } catch (java.lang.Exception ex)
-        {
-          throw new IllegalStateException(ex.toString());
-        }
-      }
-
-      public java.lang.Object newInstance(java.lang.Object parent)
-      {
-        return new jalview.schemabinding.version2.TridiagonalE();
-      }
-    };
-    desc.setHandler(handler);
-    desc.setNameSpaceURI("www.jalview.org");
-    desc.setRequired(true);
-    desc.setMultivalued(false);
-    addFieldDescriptor(desc);
-
-    // -- validation code for: _tridiagonalE
-    fieldValidator = new org.exolab.castor.xml.FieldValidator();
-    fieldValidator.setMinOccurs(1);
-    { // -- local scope
-    }
-    desc.setValidator(fieldValidator);
     // -- _eigenMatrix
     desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(
             jalview.schemabinding.version2.EigenMatrix.class,
@@ -291,51 +201,6 @@ public class PcaDataTypeDescriptor
     { // -- local scope
     }
     desc.setValidator(fieldValidator);
-    // -- _eigenMatrixD
-    desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(
-            jalview.schemabinding.version2.EigenMatrixD.class,
-            "_eigenMatrixD", "eigenMatrixD",
-            org.exolab.castor.xml.NodeType.Element);
-    handler = new org.exolab.castor.xml.XMLFieldHandler()
-    {
-      public java.lang.Object getValue(java.lang.Object object)
-              throws IllegalStateException
-      {
-        PcaDataType target = (PcaDataType) object;
-        return target.getEigenMatrixD();
-      }
-
-      public void setValue(java.lang.Object object, java.lang.Object value)
-              throws IllegalStateException, IllegalArgumentException
-      {
-        try
-        {
-          PcaDataType target = (PcaDataType) object;
-          target.setEigenMatrixD(
-                  (jalview.schemabinding.version2.EigenMatrixD) value);
-        } catch (java.lang.Exception ex)
-        {
-          throw new IllegalStateException(ex.toString());
-        }
-      }
-
-      public java.lang.Object newInstance(java.lang.Object parent)
-      {
-        return new jalview.schemabinding.version2.EigenMatrixD();
-      }
-    };
-    desc.setHandler(handler);
-    desc.setNameSpaceURI("www.jalview.org");
-    desc.setRequired(true);
-    desc.setMultivalued(false);
-    addFieldDescriptor(desc);
-
-    // -- validation code for: _eigenMatrixD
-    fieldValidator = new org.exolab.castor.xml.FieldValidator();
-    fieldValidator.setMinOccurs(1);
-    { // -- local scope
-    }
-    desc.setValidator(fieldValidator);
   }
 
   // -----------/