moved to castor-1.1-cycle - a specially patched version of castor relating to jira...

diff --git a/build.xml b/build.xml
index aa0ca67..c872cfe 100755 (executable)
--- a/build.xml
+++ b/build.xml
@@ -68,6 +68,8 @@
                <property name="outputDir" value="classes" />
                <property name="packageDir" value="dist" />
                <property name="outputJar" value="jalview.jar" />
+                <!-- Jalview Applet JMol Jar Dependency -->
+                <property name="jmolJar" value="Jmol-11.0.2.jar" />
                <!-- Jalview Web Service Clients - see the comments in 'buildextclients' for details -->
                <property name="wsdl.File" value="http://www.compbio.dundee.ac.uk/JalviewWS/services/jpred?wsdl" />
                <property name="wsdl.Files" value="http://www.compbio.dundee.ac.uk/JalviewWS/services/vamsas?wsdlFiles" />
@@ -89,12 +91,16 @@
                </path>
                <!-- The Location of the java 1.1.8 jdk -->
                <property name="java118.home" value="C:\Sun\jdk1.1.8" />
+               <property name="applet.jre.tools" value="${java118.home}/lib/classes.zip"/>
+               <!-- jre for 1.4 version
+               <property name="applet.jre.tools" value="${java.home}/lib/rt.jar"/>
+               -->
                <!-- the classpath for building the 1.1 applet -->
                <path id="jalviewlite.deps">
                        <fileset dir="${java118.home}">
                                <include name="lib/classes.zip"/>
                        </fileset>
-               <pathelement location="lib/jmol.jar"/>
+               <pathelement location="lib/${jmolJar}"/>
          </path>
        </target>
 
@@ -346,7 +352,7 @@
     target="1.1"
     srcdir="${sourceDir}" 
     destdir="${outputDir}"
-    classpath="lib/JmolApplet.jar"
+    classpath="lib/${jmolJar}"
        includes="jalview/appletgui/**"
        excludes="ext/**,MCview/**,org/**,vamsas/**"
        />
@@ -371,13 +377,27 @@
   </target>
 
   <target name="obfuscate" depends="packageApplet">
+    <path id="obfuscateDeps.path">
+    <pathelement location="${applet.jre.tools}"/>
+    <pathelement location="lib/${jmolJar}"/>
+    </path>
     <taskdef resource="proguard/ant/task.properties" classpath="utils/proguard.jar" />
     <proguard>
-      -libraryjars "${java.home}/lib/rt.jar";lib/JmolApplet.jar
+      <injar file="in.jar"/>
+      <outjar file="jalviewApplet.jar"/>
+      <libraryjar refid="obfuscateDeps.path"/>
+      <keep access="public" type="class"
+      name="jalview.bin.JalviewLite">
+        <field access="public"/>
+        <method access="public"/>
+        <constructor access="public"/>
+      </keep>
+<!--      -libraryjars "${obfuscateDeps}"
       -injars      in.jar
       -outjars     jalviewApplet.jar
       -keep public class jalview.bin.JalviewLite
        { public * ; }
+       -->
     </proguard>
     <delete file="in.jar"/>
   </target>

diff --git a/lib/castor-1.1-xml.jar b/lib/castor-1.1-cycle-xml.jar
similarity index 91%
rename from lib/castor-1.1-xml.jar
rename to lib/castor-1.1-cycle-xml.jar
index 9427fed..6702de9 100644 (file)
Binary files a/lib/castor-1.1-xml.jar and b/lib/castor-1.1-cycle-xml.jar differ

diff --git a/src/jalview/schemabinding/version2/.castor.cdr b/src/jalview/schemabinding/version2/.castor.cdr
index 24ffdfa..cb20022 100644 (file)
--- a/src/jalview/schemabinding/version2/.castor.cdr
+++ b/src/jalview/schemabinding/version2/.castor.cdr
@@ -1,4 +1,4 @@
-#Thu May 24 16:17:26 BST 2007\r
+#Sun Jun 17 14:17:08 BST 2007\r
 jalview.schemabinding.version2.AnnotationColours=jalview.schemabinding.version2.descriptors.AnnotationColoursDescriptor\r
 jalview.schemabinding.version2.Sequence=jalview.schemabinding.version2.descriptors.SequenceDescriptor\r
 jalview.schemabinding.version2.SequenceType=jalview.schemabinding.version2.descriptors.SequenceTypeDescriptor\r
@@ -15,18 +15,18 @@ jalview.schemabinding.version2.JalviewModelSequence=jalview.schemabinding.versio
 jalview.schemabinding.version2.Features=jalview.schemabinding.version2.descriptors.FeaturesDescriptor\r
 jalview.schemabinding.version2.SequenceSet=jalview.schemabinding.version2.descriptors.SequenceSetDescriptor\r
 jalview.schemabinding.version2.DBRef=jalview.schemabinding.version2.descriptors.DBRefDescriptor\r
-jalview.schemabinding.version2.Feature=jalview.schemabinding.version2.descriptors.FeatureDescriptor\r
 jalview.schemabinding.version2.Colour=jalview.schemabinding.version2.descriptors.ColourDescriptor\r
+jalview.schemabinding.version2.Feature=jalview.schemabinding.version2.descriptors.FeatureDescriptor\r
 jalview.schemabinding.version2.Viewport=jalview.schemabinding.version2.descriptors.ViewportDescriptor\r
-jalview.schemabinding.version2.JGroup=jalview.schemabinding.version2.descriptors.JGroupDescriptor\r
 jalview.schemabinding.version2.JalviewModel=jalview.schemabinding.version2.descriptors.JalviewModelDescriptor\r
+jalview.schemabinding.version2.JGroup=jalview.schemabinding.version2.descriptors.JGroupDescriptor\r
 jalview.schemabinding.version2.FeatureSettings=jalview.schemabinding.version2.descriptors.FeatureSettingsDescriptor\r
 jalview.schemabinding.version2.UserColourScheme=jalview.schemabinding.version2.descriptors.UserColourSchemeDescriptor\r
-jalview.schemabinding.version2.Group=jalview.schemabinding.version2.descriptors.GroupDescriptor\r
-jalview.schemabinding.version2.HiddenColumns=jalview.schemabinding.version2.descriptors.HiddenColumnsDescriptor\r
 jalview.schemabinding.version2.Pdbids=jalview.schemabinding.version2.descriptors.PdbidsDescriptor\r
-jalview.schemabinding.version2.Setting=jalview.schemabinding.version2.descriptors.SettingDescriptor\r
+jalview.schemabinding.version2.HiddenColumns=jalview.schemabinding.version2.descriptors.HiddenColumnsDescriptor\r
+jalview.schemabinding.version2.Group=jalview.schemabinding.version2.descriptors.GroupDescriptor\r
 jalview.schemabinding.version2.Tree=jalview.schemabinding.version2.descriptors.TreeDescriptor\r
+jalview.schemabinding.version2.Setting=jalview.schemabinding.version2.descriptors.SettingDescriptor\r
 jalview.schemabinding.version2.UserColours=jalview.schemabinding.version2.descriptors.UserColoursDescriptor\r
 jalview.schemabinding.version2.JSeq=jalview.schemabinding.version2.descriptors.JSeqDescriptor\r
 jalview.schemabinding.version2.SequenceSetProperties=jalview.schemabinding.version2.descriptors.SequenceSetPropertiesDescriptor\r

diff --git a/src/jalview/schemabinding/version2/descriptors/AnnotationColoursDescriptor.java b/src/jalview/schemabinding/version2/descriptors/AnnotationColoursDescriptor.java
index 4474867..3d32ff6 100644 (file)
--- a/src/jalview/schemabinding/version2/descriptors/AnnotationColoursDescriptor.java
+++ b/src/jalview/schemabinding/version2/descriptors/AnnotationColoursDescriptor.java
@@ -45,11 +45,6 @@ public class AnnotationColoursDescriptor extends org.exolab.castor.xml.util.XMLC
      */\r
     private java.lang.String _xmlName;\r
 \r
-    /**\r
-     * Field _identity.\r
-     */\r
-    private org.exolab.castor.xml.XMLFieldDescriptor _identity;\r
-\r
 \r
       //----------------/\r
      //- Constructors -/\r
@@ -338,7 +333,7 @@ public class AnnotationColoursDescriptor extends org.exolab.castor.xml.util.XMLC
      */\r
     public org.exolab.castor.mapping.FieldDescriptor getIdentity(\r
     ) {\r
-        return _identity;\r
+        return super.getIdentity();\r
     }\r
 \r
     /**\r

diff --git a/src/jalview/schemabinding/version2/descriptors/AnnotationDescriptor.java b/src/jalview/schemabinding/version2/descriptors/AnnotationDescriptor.java
index e06c62c..44576ee 100644 (file)
--- a/src/jalview/schemabinding/version2/descriptors/AnnotationDescriptor.java
+++ b/src/jalview/schemabinding/version2/descriptors/AnnotationDescriptor.java
@@ -45,11 +45,6 @@ public class AnnotationDescriptor extends org.exolab.castor.xml.util.XMLClassDes
      */\r
     private java.lang.String _xmlName;\r
 \r
-    /**\r
-     * Field _identity.\r
-     */\r
-    private org.exolab.castor.xml.XMLFieldDescriptor _identity;\r
-\r
 \r
       //----------------/\r
      //- Constructors -/\r
@@ -617,7 +612,7 @@ public class AnnotationDescriptor extends org.exolab.castor.xml.util.XMLClassDes
      */\r
     public org.exolab.castor.mapping.FieldDescriptor getIdentity(\r
     ) {\r
-        return _identity;\r
+        return super.getIdentity();\r
     }\r
 \r
     /**\r

diff --git a/src/jalview/schemabinding/version2/descriptors/AnnotationElementDescriptor.java b/src/jalview/schemabinding/version2/descriptors/AnnotationElementDescriptor.java
index 7441e9e..61221a1 100644 (file)
--- a/src/jalview/schemabinding/version2/descriptors/AnnotationElementDescriptor.java
+++ b/src/jalview/schemabinding/version2/descriptors/AnnotationElementDescriptor.java
@@ -45,11 +45,6 @@ public class AnnotationElementDescriptor extends org.exolab.castor.xml.util.XMLC
      */\r
     private java.lang.String _xmlName;\r
 \r
-    /**\r
-     * Field _identity.\r
-     */\r
-    private org.exolab.castor.xml.XMLFieldDescriptor _identity;\r
-\r
 \r
       //----------------/\r
      //- Constructors -/\r
@@ -340,7 +335,7 @@ public class AnnotationElementDescriptor extends org.exolab.castor.xml.util.XMLC
      */\r
     public org.exolab.castor.mapping.FieldDescriptor getIdentity(\r
     ) {\r
-        return _identity;\r
+        return super.getIdentity();\r
     }\r
 \r
     /**\r

diff --git a/src/jalview/schemabinding/version2/descriptors/ColourDescriptor.java b/src/jalview/schemabinding/version2/descriptors/ColourDescriptor.java
index 8dee424..bdd9739 100644 (file)
--- a/src/jalview/schemabinding/version2/descriptors/ColourDescriptor.java
+++ b/src/jalview/schemabinding/version2/descriptors/ColourDescriptor.java
@@ -45,11 +45,6 @@ public class ColourDescriptor extends org.exolab.castor.xml.util.XMLClassDescrip
      */\r
     private java.lang.String _xmlName;\r
 \r
-    /**\r
-     * Field _identity.\r
-     */\r
-    private org.exolab.castor.xml.XMLFieldDescriptor _identity;\r
-\r
 \r
       //----------------/\r
      //- Constructors -/\r
@@ -167,7 +162,7 @@ public class ColourDescriptor extends org.exolab.castor.xml.util.XMLClassDescrip
      */\r
     public org.exolab.castor.mapping.FieldDescriptor getIdentity(\r
     ) {\r
-        return _identity;\r
+        return super.getIdentity();\r
     }\r
 \r
     /**\r

diff --git a/src/jalview/schemabinding/version2/descriptors/DBRefDescriptor.java b/src/jalview/schemabinding/version2/descriptors/DBRefDescriptor.java
index 9a348b0..877f931 100644 (file)
--- a/src/jalview/schemabinding/version2/descriptors/DBRefDescriptor.java
+++ b/src/jalview/schemabinding/version2/descriptors/DBRefDescriptor.java
@@ -45,11 +45,6 @@ public class DBRefDescriptor extends org.exolab.castor.xml.util.XMLClassDescript
      */\r
     private java.lang.String _xmlName;\r
 \r
-    /**\r
-     * Field _identity.\r
-     */\r
-    private org.exolab.castor.xml.XMLFieldDescriptor _identity;\r
-\r
 \r
       //----------------/\r
      //- Constructors -/\r
@@ -203,7 +198,7 @@ public class DBRefDescriptor extends org.exolab.castor.xml.util.XMLClassDescript
      */\r
     public org.exolab.castor.mapping.FieldDescriptor getIdentity(\r
     ) {\r
-        return _identity;\r
+        return super.getIdentity();\r
     }\r
 \r
     /**\r

diff --git a/src/jalview/schemabinding/version2/descriptors/FeatureDescriptor.java b/src/jalview/schemabinding/version2/descriptors/FeatureDescriptor.java
index b5ac5f5..92c919e 100644 (file)
--- a/src/jalview/schemabinding/version2/descriptors/FeatureDescriptor.java
+++ b/src/jalview/schemabinding/version2/descriptors/FeatureDescriptor.java
@@ -45,11 +45,6 @@ public class FeatureDescriptor extends org.exolab.castor.xml.util.XMLClassDescri
      */\r
     private java.lang.String _xmlName;\r
 \r
-    /**\r
-     * Field _identity.\r
-     */\r
-    private org.exolab.castor.xml.XMLFieldDescriptor _identity;\r
-\r
 \r
       //----------------/\r
      //- Constructors -/\r
@@ -416,7 +411,7 @@ public class FeatureDescriptor extends org.exolab.castor.xml.util.XMLClassDescri
      */\r
     public org.exolab.castor.mapping.FieldDescriptor getIdentity(\r
     ) {\r
-        return _identity;\r
+        return super.getIdentity();\r
     }\r
 \r
     /**\r

diff --git a/src/jalview/schemabinding/version2/descriptors/FeatureSettingsDescriptor.java b/src/jalview/schemabinding/version2/descriptors/FeatureSettingsDescriptor.java
index 6097bfa..930aac9 100644 (file)
--- a/src/jalview/schemabinding/version2/descriptors/FeatureSettingsDescriptor.java
+++ b/src/jalview/schemabinding/version2/descriptors/FeatureSettingsDescriptor.java
@@ -45,11 +45,6 @@ public class FeatureSettingsDescriptor extends org.exolab.castor.xml.util.XMLCla
      */\r
     private java.lang.String _xmlName;\r
 \r
-    /**\r
-     * Field _identity.\r
-     */\r
-    private org.exolab.castor.xml.XMLFieldDescriptor _identity;\r
-\r
 \r
       //----------------/\r
      //- Constructors -/\r
@@ -179,7 +174,7 @@ public class FeatureSettingsDescriptor extends org.exolab.castor.xml.util.XMLCla
      */\r
     public org.exolab.castor.mapping.FieldDescriptor getIdentity(\r
     ) {\r
-        return _identity;\r
+        return super.getIdentity();\r
     }\r
 \r
     /**\r

diff --git a/src/jalview/schemabinding/version2/descriptors/FeaturesDescriptor.java b/src/jalview/schemabinding/version2/descriptors/FeaturesDescriptor.java
index 6ebbb34..380d46e 100644 (file)
--- a/src/jalview/schemabinding/version2/descriptors/FeaturesDescriptor.java
+++ b/src/jalview/schemabinding/version2/descriptors/FeaturesDescriptor.java
@@ -45,11 +45,6 @@ public class FeaturesDescriptor extends jalview.schemabinding.version2.descripto
      */\r
     private java.lang.String _xmlName;\r
 \r
-    /**\r
-     * Field _identity.\r
-     */\r
-    private org.exolab.castor.xml.XMLFieldDescriptor _identity;\r
-\r
 \r
       //----------------/\r
      //- Constructors -/\r
@@ -86,10 +81,7 @@ public class FeaturesDescriptor extends jalview.schemabinding.version2.descripto
      */\r
     public org.exolab.castor.mapping.FieldDescriptor getIdentity(\r
     ) {\r
-        if (_identity == null) {\r
-            return super.getIdentity();\r
-        }\r
-        return _identity;\r
+        return super.getIdentity();\r
     }\r
 \r
     /**\r

diff --git a/src/jalview/schemabinding/version2/descriptors/GroupDescriptor.java b/src/jalview/schemabinding/version2/descriptors/GroupDescriptor.java
index a0bacc0..417dbbb 100644 (file)
--- a/src/jalview/schemabinding/version2/descriptors/GroupDescriptor.java
+++ b/src/jalview/schemabinding/version2/descriptors/GroupDescriptor.java
@@ -45,11 +45,6 @@ public class GroupDescriptor extends org.exolab.castor.xml.util.XMLClassDescript
      */\r
     private java.lang.String _xmlName;\r
 \r
-    /**\r
-     * Field _identity.\r
-     */\r
-    private org.exolab.castor.xml.XMLFieldDescriptor _identity;\r
-\r
 \r
       //----------------/\r
      //- Constructors -/\r
@@ -172,7 +167,7 @@ public class GroupDescriptor extends org.exolab.castor.xml.util.XMLClassDescript
      */\r
     public org.exolab.castor.mapping.FieldDescriptor getIdentity(\r
     ) {\r
-        return _identity;\r
+        return super.getIdentity();\r
     }\r
 \r
     /**\r

diff --git a/src/jalview/schemabinding/version2/descriptors/HiddenColumnsDescriptor.java b/src/jalview/schemabinding/version2/descriptors/HiddenColumnsDescriptor.java
index 90ef5ab..f307ee4 100644 (file)
--- a/src/jalview/schemabinding/version2/descriptors/HiddenColumnsDescriptor.java
+++ b/src/jalview/schemabinding/version2/descriptors/HiddenColumnsDescriptor.java
@@ -45,11 +45,6 @@ public class HiddenColumnsDescriptor extends org.exolab.castor.xml.util.XMLClass
      */\r
     private java.lang.String _xmlName;\r
 \r
-    /**\r
-     * Field _identity.\r
-     */\r
-    private org.exolab.castor.xml.XMLFieldDescriptor _identity;\r
-\r
 \r
       //----------------/\r
      //- Constructors -/\r
@@ -178,7 +173,7 @@ public class HiddenColumnsDescriptor extends org.exolab.castor.xml.util.XMLClass
      */\r
     public org.exolab.castor.mapping.FieldDescriptor getIdentity(\r
     ) {\r
-        return _identity;\r
+        return super.getIdentity();\r
     }\r
 \r
     /**\r

diff --git a/src/jalview/schemabinding/version2/descriptors/JGroupDescriptor.java b/src/jalview/schemabinding/version2/descriptors/JGroupDescriptor.java
index 1ab08a2..adde010 100644 (file)
--- a/src/jalview/schemabinding/version2/descriptors/JGroupDescriptor.java
+++ b/src/jalview/schemabinding/version2/descriptors/JGroupDescriptor.java
@@ -45,11 +45,6 @@ public class JGroupDescriptor extends org.exolab.castor.xml.util.XMLClassDescrip
      */\r
     private java.lang.String _xmlName;\r
 \r
-    /**\r
-     * Field _identity.\r
-     */\r
-    private org.exolab.castor.xml.XMLFieldDescriptor _identity;\r
-\r
 \r
       //----------------/\r
      //- Constructors -/\r
@@ -687,7 +682,7 @@ public class JGroupDescriptor extends org.exolab.castor.xml.util.XMLClassDescrip
      */\r
     public org.exolab.castor.mapping.FieldDescriptor getIdentity(\r
     ) {\r
-        return _identity;\r
+        return super.getIdentity();\r
     }\r
 \r
     /**\r

diff --git a/src/jalview/schemabinding/version2/descriptors/JSeqDescriptor.java b/src/jalview/schemabinding/version2/descriptors/JSeqDescriptor.java
index 3d3a4f5..738d4fc 100644 (file)
--- a/src/jalview/schemabinding/version2/descriptors/JSeqDescriptor.java
+++ b/src/jalview/schemabinding/version2/descriptors/JSeqDescriptor.java
@@ -45,11 +45,6 @@ public class JSeqDescriptor extends org.exolab.castor.xml.util.XMLClassDescripto
      */\r
     private java.lang.String _xmlName;\r
 \r
-    /**\r
-     * Field _identity.\r
-     */\r
-    private org.exolab.castor.xml.XMLFieldDescriptor _identity;\r
-\r
 \r
       //----------------/\r
      //- Constructors -/\r
@@ -442,7 +437,7 @@ public class JSeqDescriptor extends org.exolab.castor.xml.util.XMLClassDescripto
      */\r
     public org.exolab.castor.mapping.FieldDescriptor getIdentity(\r
     ) {\r
-        return _identity;\r
+        return super.getIdentity();\r
     }\r
 \r
     /**\r

diff --git a/src/jalview/schemabinding/version2/descriptors/JalviewModelDescriptor.java b/src/jalview/schemabinding/version2/descriptors/JalviewModelDescriptor.java
index eb5e0dd..9aad95c 100644 (file)
--- a/src/jalview/schemabinding/version2/descriptors/JalviewModelDescriptor.java
+++ b/src/jalview/schemabinding/version2/descriptors/JalviewModelDescriptor.java
@@ -45,11 +45,6 @@ public class JalviewModelDescriptor extends org.exolab.castor.xml.util.XMLClassD
      */\r
     private java.lang.String _xmlName;\r
 \r
-    /**\r
-     * Field _identity.\r
-     */\r
-    private org.exolab.castor.xml.XMLFieldDescriptor _identity;\r
-\r
 \r
       //----------------/\r
      //- Constructors -/\r
@@ -247,7 +242,7 @@ public class JalviewModelDescriptor extends org.exolab.castor.xml.util.XMLClassD
      */\r
     public org.exolab.castor.mapping.FieldDescriptor getIdentity(\r
     ) {\r
-        return _identity;\r
+        return super.getIdentity();\r
     }\r
 \r
     /**\r

diff --git a/src/jalview/schemabinding/version2/descriptors/JalviewModelSequenceDescriptor.java b/src/jalview/schemabinding/version2/descriptors/JalviewModelSequenceDescriptor.java
index 2bbb1ff..d6fd0ba 100644 (file)
--- a/src/jalview/schemabinding/version2/descriptors/JalviewModelSequenceDescriptor.java
+++ b/src/jalview/schemabinding/version2/descriptors/JalviewModelSequenceDescriptor.java
@@ -45,11 +45,6 @@ public class JalviewModelSequenceDescriptor extends org.exolab.castor.xml.util.X
      */\r
     private java.lang.String _xmlName;\r
 \r
-    /**\r
-     * Field _identity.\r
-     */\r
-    private org.exolab.castor.xml.XMLFieldDescriptor _identity;\r
-\r
 \r
       //----------------/\r
      //- Constructors -/\r
@@ -339,7 +334,7 @@ public class JalviewModelSequenceDescriptor extends org.exolab.castor.xml.util.X
      */\r
     public org.exolab.castor.mapping.FieldDescriptor getIdentity(\r
     ) {\r
-        return _identity;\r
+        return super.getIdentity();\r
     }\r
 \r
     /**\r

diff --git a/src/jalview/schemabinding/version2/descriptors/JalviewUserColoursDescriptor.java b/src/jalview/schemabinding/version2/descriptors/JalviewUserColoursDescriptor.java
index 1b12b63..dd155dd 100644 (file)
--- a/src/jalview/schemabinding/version2/descriptors/JalviewUserColoursDescriptor.java
+++ b/src/jalview/schemabinding/version2/descriptors/JalviewUserColoursDescriptor.java
@@ -11,8 +11,9 @@ package jalview.schemabinding.version2.descriptors;
  //- Imported classes and packages -/\r
 //---------------------------------/\r
 \r
+import jalview.schemabinding.version2.Colour;\r
 import jalview.schemabinding.version2.JalviewUserColours;\r
-import jalview.schemabinding.version2.Colour; // Added Manually\r
+\r
 /**\r
  * Class JalviewUserColoursDescriptor.\r
  * \r
@@ -45,11 +46,6 @@ public class JalviewUserColoursDescriptor extends org.exolab.castor.xml.util.XML
      */\r
     private java.lang.String _xmlName;\r
 \r
-    /**\r
-     * Field _identity.\r
-     */\r
-    private org.exolab.castor.xml.XMLFieldDescriptor _identity;\r
-\r
 \r
       //----------------/\r
      //- Constructors -/\r
@@ -174,7 +170,7 @@ public class JalviewUserColoursDescriptor extends org.exolab.castor.xml.util.XML
      */\r
     public org.exolab.castor.mapping.FieldDescriptor getIdentity(\r
     ) {\r
-        return _identity;\r
+        return super.getIdentity();\r
     }\r
 \r
     /**\r

diff --git a/src/jalview/schemabinding/version2/descriptors/OtherDataDescriptor.java b/src/jalview/schemabinding/version2/descriptors/OtherDataDescriptor.java
index e5dc0b8..46f6682 100644 (file)
--- a/src/jalview/schemabinding/version2/descriptors/OtherDataDescriptor.java
+++ b/src/jalview/schemabinding/version2/descriptors/OtherDataDescriptor.java
@@ -45,11 +45,6 @@ public class OtherDataDescriptor extends org.exolab.castor.xml.util.XMLClassDesc
      */\r
     private java.lang.String _xmlName;\r
 \r
-    /**\r
-     * Field _identity.\r
-     */\r
-    private org.exolab.castor.xml.XMLFieldDescriptor _identity;\r
-\r
 \r
       //----------------/\r
      //- Constructors -/\r
@@ -170,7 +165,7 @@ public class OtherDataDescriptor extends org.exolab.castor.xml.util.XMLClassDesc
      */\r
     public org.exolab.castor.mapping.FieldDescriptor getIdentity(\r
     ) {\r
-        return _identity;\r
+        return super.getIdentity();\r
     }\r
 \r
     /**\r

diff --git a/src/jalview/schemabinding/version2/descriptors/PdbentryDescriptor.java b/src/jalview/schemabinding/version2/descriptors/PdbentryDescriptor.java
index 97fedd9..dbf0c3a 100644 (file)
--- a/src/jalview/schemabinding/version2/descriptors/PdbentryDescriptor.java
+++ b/src/jalview/schemabinding/version2/descriptors/PdbentryDescriptor.java
@@ -45,11 +45,6 @@ public class PdbentryDescriptor extends org.exolab.castor.xml.util.XMLClassDescr
      */\r
     private java.lang.String _xmlName;\r
 \r
-    /**\r
-     * Field _identity.\r
-     */\r
-    private org.exolab.castor.xml.XMLFieldDescriptor _identity;\r
-\r
 \r
       //----------------/\r
      //- Constructors -/\r
@@ -247,7 +242,7 @@ public class PdbentryDescriptor extends org.exolab.castor.xml.util.XMLClassDescr
      */\r
     public org.exolab.castor.mapping.FieldDescriptor getIdentity(\r
     ) {\r
-        return _identity;\r
+        return super.getIdentity();\r
     }\r
 \r
     /**\r

diff --git a/src/jalview/schemabinding/version2/descriptors/PdbentryItemDescriptor.java b/src/jalview/schemabinding/version2/descriptors/PdbentryItemDescriptor.java
index ccd26c1..693ad61 100644 (file)
--- a/src/jalview/schemabinding/version2/descriptors/PdbentryItemDescriptor.java
+++ b/src/jalview/schemabinding/version2/descriptors/PdbentryItemDescriptor.java
@@ -45,11 +45,6 @@ public class PdbentryItemDescriptor extends org.exolab.castor.xml.util.XMLClassD
      */\r
     private java.lang.String _xmlName;\r
 \r
-    /**\r
-     * Field _identity.\r
-     */\r
-    private org.exolab.castor.xml.XMLFieldDescriptor _identity;\r
-\r
 \r
       //----------------/\r
      //- Constructors -/\r
@@ -137,7 +132,7 @@ public class PdbentryItemDescriptor extends org.exolab.castor.xml.util.XMLClassD
      */\r
     public org.exolab.castor.mapping.FieldDescriptor getIdentity(\r
     ) {\r
-        return _identity;\r
+        return super.getIdentity();\r
     }\r
 \r
     /**\r

diff --git a/src/jalview/schemabinding/version2/descriptors/PdbidsDescriptor.java b/src/jalview/schemabinding/version2/descriptors/PdbidsDescriptor.java
index 265e907..2547f1d 100644 (file)
--- a/src/jalview/schemabinding/version2/descriptors/PdbidsDescriptor.java
+++ b/src/jalview/schemabinding/version2/descriptors/PdbidsDescriptor.java
@@ -45,11 +45,6 @@ public class PdbidsDescriptor extends jalview.schemabinding.version2.descriptors
      */\r
     private java.lang.String _xmlName;\r
 \r
-    /**\r
-     * Field _identity.\r
-     */\r
-    private org.exolab.castor.xml.XMLFieldDescriptor _identity;\r
-\r
 \r
       //----------------/\r
      //- Constructors -/\r
@@ -138,10 +133,7 @@ public class PdbidsDescriptor extends jalview.schemabinding.version2.descriptors
      */\r
     public org.exolab.castor.mapping.FieldDescriptor getIdentity(\r
     ) {\r
-        if (_identity == null) {\r
-            return super.getIdentity();\r
-        }\r
-        return _identity;\r
+        return super.getIdentity();\r
     }\r
 \r
     /**\r

diff --git a/src/jalview/schemabinding/version2/descriptors/PropertyDescriptor.java b/src/jalview/schemabinding/version2/descriptors/PropertyDescriptor.java
index 1bdcf5f..15f2e37 100644 (file)
--- a/src/jalview/schemabinding/version2/descriptors/PropertyDescriptor.java
+++ b/src/jalview/schemabinding/version2/descriptors/PropertyDescriptor.java
@@ -45,11 +45,6 @@ public class PropertyDescriptor extends org.exolab.castor.xml.util.XMLClassDescr
      */\r
     private java.lang.String _xmlName;\r
 \r
-    /**\r
-     * Field _identity.\r
-     */\r
-    private org.exolab.castor.xml.XMLFieldDescriptor _identity;\r
-\r
 \r
       //----------------/\r
      //- Constructors -/\r
@@ -170,7 +165,7 @@ public class PropertyDescriptor extends org.exolab.castor.xml.util.XMLClassDescr
      */\r
     public org.exolab.castor.mapping.FieldDescriptor getIdentity(\r
     ) {\r
-        return _identity;\r
+        return super.getIdentity();\r
     }\r
 \r
     /**\r

diff --git a/src/jalview/schemabinding/version2/descriptors/SequenceDescriptor.java b/src/jalview/schemabinding/version2/descriptors/SequenceDescriptor.java
index 9f2da96..15a81e2 100644 (file)
--- a/src/jalview/schemabinding/version2/descriptors/SequenceDescriptor.java
+++ b/src/jalview/schemabinding/version2/descriptors/SequenceDescriptor.java
@@ -45,11 +45,6 @@ public class SequenceDescriptor extends jalview.schemabinding.version2.descripto
      */\r
     private java.lang.String _xmlName;\r
 \r
-    /**\r
-     * Field _identity.\r
-     */\r
-    private org.exolab.castor.xml.XMLFieldDescriptor _identity;\r
-\r
 \r
       //----------------/\r
      //- Constructors -/\r
@@ -138,10 +133,7 @@ public class SequenceDescriptor extends jalview.schemabinding.version2.descripto
      */\r
     public org.exolab.castor.mapping.FieldDescriptor getIdentity(\r
     ) {\r
-        if (_identity == null) {\r
-            return super.getIdentity();\r
-        }\r
-        return _identity;\r
+        return super.getIdentity();\r
     }\r
 \r
     /**\r

diff --git a/src/jalview/schemabinding/version2/descriptors/SequenceSetDescriptor.java b/src/jalview/schemabinding/version2/descriptors/SequenceSetDescriptor.java
index 2801940..ca59cf3 100644 (file)
--- a/src/jalview/schemabinding/version2/descriptors/SequenceSetDescriptor.java
+++ b/src/jalview/schemabinding/version2/descriptors/SequenceSetDescriptor.java
@@ -45,11 +45,6 @@ public class SequenceSetDescriptor extends org.exolab.castor.xml.util.XMLClassDe
      */\r
     private java.lang.String _xmlName;\r
 \r
-    /**\r
-     * Field _identity.\r
-     */\r
-    private org.exolab.castor.xml.XMLFieldDescriptor _identity;\r
-\r
 \r
       //----------------/\r
      //- Constructors -/\r
@@ -260,7 +255,7 @@ public class SequenceSetDescriptor extends org.exolab.castor.xml.util.XMLClassDe
      */\r
     public org.exolab.castor.mapping.FieldDescriptor getIdentity(\r
     ) {\r
-        return _identity;\r
+        return super.getIdentity();\r
     }\r
 \r
     /**\r

diff --git a/src/jalview/schemabinding/version2/descriptors/SequenceSetPropertiesDescriptor.java b/src/jalview/schemabinding/version2/descriptors/SequenceSetPropertiesDescriptor.java
index af6975d..9c3c578 100644 (file)
--- a/src/jalview/schemabinding/version2/descriptors/SequenceSetPropertiesDescriptor.java
+++ b/src/jalview/schemabinding/version2/descriptors/SequenceSetPropertiesDescriptor.java
@@ -45,11 +45,6 @@ public class SequenceSetPropertiesDescriptor extends org.exolab.castor.xml.util.
      */\r
     private java.lang.String _xmlName;\r
 \r
-    /**\r
-     * Field _identity.\r
-     */\r
-    private org.exolab.castor.xml.XMLFieldDescriptor _identity;\r
-\r
 \r
       //----------------/\r
      //- Constructors -/\r
@@ -166,7 +161,7 @@ public class SequenceSetPropertiesDescriptor extends org.exolab.castor.xml.util.
      */\r
     public org.exolab.castor.mapping.FieldDescriptor getIdentity(\r
     ) {\r
-        return _identity;\r
+        return super.getIdentity();\r
     }\r
 \r
     /**\r

diff --git a/src/jalview/schemabinding/version2/descriptors/SequenceTypeDescriptor.java b/src/jalview/schemabinding/version2/descriptors/SequenceTypeDescriptor.java
index 9d7d579..fa73621 100644 (file)
--- a/src/jalview/schemabinding/version2/descriptors/SequenceTypeDescriptor.java
+++ b/src/jalview/schemabinding/version2/descriptors/SequenceTypeDescriptor.java
@@ -45,11 +45,6 @@ public class SequenceTypeDescriptor extends org.exolab.castor.xml.util.XMLClassD
      */\r
     private java.lang.String _xmlName;\r
 \r
-    /**\r
-     * Field _identity.\r
-     */\r
-    private org.exolab.castor.xml.XMLFieldDescriptor _identity;\r
-\r
 \r
       //----------------/\r
      //- Constructors -/\r
@@ -245,7 +240,7 @@ public class SequenceTypeDescriptor extends org.exolab.castor.xml.util.XMLClassD
      */\r
     public org.exolab.castor.mapping.FieldDescriptor getIdentity(\r
     ) {\r
-        return _identity;\r
+        return super.getIdentity();\r
     }\r
 \r
     /**\r

diff --git a/src/jalview/schemabinding/version2/descriptors/SettingDescriptor.java b/src/jalview/schemabinding/version2/descriptors/SettingDescriptor.java
index 8214765..23783bb 100644 (file)
--- a/src/jalview/schemabinding/version2/descriptors/SettingDescriptor.java
+++ b/src/jalview/schemabinding/version2/descriptors/SettingDescriptor.java
@@ -45,11 +45,6 @@ public class SettingDescriptor extends org.exolab.castor.xml.util.XMLClassDescri
      */\r
     private java.lang.String _xmlName;\r
 \r
-    /**\r
-     * Field _identity.\r
-     */\r
-    private org.exolab.castor.xml.XMLFieldDescriptor _identity;\r
-\r
 \r
       //----------------/\r
      //- Constructors -/\r
@@ -258,7 +253,7 @@ public class SettingDescriptor extends org.exolab.castor.xml.util.XMLClassDescri
      */\r
     public org.exolab.castor.mapping.FieldDescriptor getIdentity(\r
     ) {\r
-        return _identity;\r
+        return super.getIdentity();\r
     }\r
 \r
     /**\r

diff --git a/src/jalview/schemabinding/version2/descriptors/StructureStateDescriptor.java b/src/jalview/schemabinding/version2/descriptors/StructureStateDescriptor.java
index 31f2389..8584429 100644 (file)
--- a/src/jalview/schemabinding/version2/descriptors/StructureStateDescriptor.java
+++ b/src/jalview/schemabinding/version2/descriptors/StructureStateDescriptor.java
@@ -45,11 +45,6 @@ public class StructureStateDescriptor extends org.exolab.castor.xml.util.XMLClas
      */\r
     private java.lang.String _xmlName;\r
 \r
-    /**\r
-     * Field _identity.\r
-     */\r
-    private org.exolab.castor.xml.XMLFieldDescriptor _identity;\r
-\r
 \r
       //----------------/\r
      //- Constructors -/\r
@@ -341,7 +336,7 @@ public class StructureStateDescriptor extends org.exolab.castor.xml.util.XMLClas
      */\r
     public org.exolab.castor.mapping.FieldDescriptor getIdentity(\r
     ) {\r
-        return _identity;\r
+        return super.getIdentity();\r
     }\r
 \r
     /**\r

diff --git a/src/jalview/schemabinding/version2/descriptors/ThresholdLineDescriptor.java b/src/jalview/schemabinding/version2/descriptors/ThresholdLineDescriptor.java
index e43b8cc..951e7ca 100644 (file)
--- a/src/jalview/schemabinding/version2/descriptors/ThresholdLineDescriptor.java
+++ b/src/jalview/schemabinding/version2/descriptors/ThresholdLineDescriptor.java
@@ -45,11 +45,6 @@ public class ThresholdLineDescriptor extends org.exolab.castor.xml.util.XMLClass
      */\r
     private java.lang.String _xmlName;\r
 \r
-    /**\r
-     * Field _identity.\r
-     */\r
-    private org.exolab.castor.xml.XMLFieldDescriptor _identity;\r
-\r
 \r
       //----------------/\r
      //- Constructors -/\r
@@ -215,7 +210,7 @@ public class ThresholdLineDescriptor extends org.exolab.castor.xml.util.XMLClass
      */\r
     public org.exolab.castor.mapping.FieldDescriptor getIdentity(\r
     ) {\r
-        return _identity;\r
+        return super.getIdentity();\r
     }\r
 \r
     /**\r

diff --git a/src/jalview/schemabinding/version2/descriptors/TreeDescriptor.java b/src/jalview/schemabinding/version2/descriptors/TreeDescriptor.java
index 8ac65d0..9d508a4 100644 (file)
--- a/src/jalview/schemabinding/version2/descriptors/TreeDescriptor.java
+++ b/src/jalview/schemabinding/version2/descriptors/TreeDescriptor.java
@@ -45,11 +45,6 @@ public class TreeDescriptor extends org.exolab.castor.xml.util.XMLClassDescripto
      */\r
     private java.lang.String _xmlName;\r
 \r
-    /**\r
-     * Field _identity.\r
-     */\r
-    private org.exolab.castor.xml.XMLFieldDescriptor _identity;\r
-\r
 \r
       //----------------/\r
      //- Constructors -/\r
@@ -714,7 +709,7 @@ public class TreeDescriptor extends org.exolab.castor.xml.util.XMLClassDescripto
      */\r
     public org.exolab.castor.mapping.FieldDescriptor getIdentity(\r
     ) {\r
-        return _identity;\r
+        return super.getIdentity();\r
     }\r
 \r
     /**\r

diff --git a/src/jalview/schemabinding/version2/descriptors/UserColourSchemeDescriptor.java b/src/jalview/schemabinding/version2/descriptors/UserColourSchemeDescriptor.java
index 634239f..be7012a 100644 (file)
--- a/src/jalview/schemabinding/version2/descriptors/UserColourSchemeDescriptor.java
+++ b/src/jalview/schemabinding/version2/descriptors/UserColourSchemeDescriptor.java
@@ -45,11 +45,6 @@ public class UserColourSchemeDescriptor extends jalview.schemabinding.version2.d
      */\r
     private java.lang.String _xmlName;\r
 \r
-    /**\r
-     * Field _identity.\r
-     */\r
-    private org.exolab.castor.xml.XMLFieldDescriptor _identity;\r
-\r
 \r
       //----------------/\r
      //- Constructors -/\r
@@ -86,10 +81,7 @@ public class UserColourSchemeDescriptor extends jalview.schemabinding.version2.d
      */\r
     public org.exolab.castor.mapping.FieldDescriptor getIdentity(\r
     ) {\r
-        if (_identity == null) {\r
-            return super.getIdentity();\r
-        }\r
-        return _identity;\r
+        return super.getIdentity();\r
     }\r
 \r
     /**\r

diff --git a/src/jalview/schemabinding/version2/descriptors/UserColoursDescriptor.java b/src/jalview/schemabinding/version2/descriptors/UserColoursDescriptor.java
index 32382a4..bda1c5e 100644 (file)
--- a/src/jalview/schemabinding/version2/descriptors/UserColoursDescriptor.java
+++ b/src/jalview/schemabinding/version2/descriptors/UserColoursDescriptor.java
@@ -45,11 +45,6 @@ public class UserColoursDescriptor extends org.exolab.castor.xml.util.XMLClassDe
      */\r
     private java.lang.String _xmlName;\r
 \r
-    /**\r
-     * Field _identity.\r
-     */\r
-    private org.exolab.castor.xml.XMLFieldDescriptor _identity;\r
-\r
 \r
       //----------------/\r
      //- Constructors -/\r
@@ -167,7 +162,7 @@ public class UserColoursDescriptor extends org.exolab.castor.xml.util.XMLClassDe
      */\r
     public org.exolab.castor.mapping.FieldDescriptor getIdentity(\r
     ) {\r
-        return _identity;\r
+        return super.getIdentity();\r
     }\r
 \r
     /**\r

diff --git a/src/jalview/schemabinding/version2/descriptors/VAMSASDescriptor.java b/src/jalview/schemabinding/version2/descriptors/VAMSASDescriptor.java
index f8d9ba8..375f435 100644 (file)
--- a/src/jalview/schemabinding/version2/descriptors/VAMSASDescriptor.java
+++ b/src/jalview/schemabinding/version2/descriptors/VAMSASDescriptor.java
@@ -45,11 +45,6 @@ public class VAMSASDescriptor extends org.exolab.castor.xml.util.XMLClassDescrip
      */\r
     private java.lang.String _xmlName;\r
 \r
-    /**\r
-     * Field _identity.\r
-     */\r
-    private org.exolab.castor.xml.XMLFieldDescriptor _identity;\r
-\r
 \r
       //----------------/\r
      //- Constructors -/\r
@@ -184,7 +179,7 @@ public class VAMSASDescriptor extends org.exolab.castor.xml.util.XMLClassDescrip
      */\r
     public org.exolab.castor.mapping.FieldDescriptor getIdentity(\r
     ) {\r
-        return _identity;\r
+        return super.getIdentity();\r
     }\r
 \r
     /**\r

diff --git a/src/jalview/schemabinding/version2/descriptors/VamsasModelDescriptor.java b/src/jalview/schemabinding/version2/descriptors/VamsasModelDescriptor.java
index 5f46219..bc14cfd 100644 (file)
--- a/src/jalview/schemabinding/version2/descriptors/VamsasModelDescriptor.java
+++ b/src/jalview/schemabinding/version2/descriptors/VamsasModelDescriptor.java
@@ -45,11 +45,6 @@ public class VamsasModelDescriptor extends jalview.schemabinding.version2.descri
      */\r
     private java.lang.String _xmlName;\r
 \r
-    /**\r
-     * Field _identity.\r
-     */\r
-    private org.exolab.castor.xml.XMLFieldDescriptor _identity;\r
-\r
 \r
       //----------------/\r
      //- Constructors -/\r
@@ -86,10 +81,7 @@ public class VamsasModelDescriptor extends jalview.schemabinding.version2.descri
      */\r
     public org.exolab.castor.mapping.FieldDescriptor getIdentity(\r
     ) {\r
-        if (_identity == null) {\r
-            return super.getIdentity();\r
-        }\r
-        return _identity;\r
+        return super.getIdentity();\r
     }\r
 \r
     /**\r

diff --git a/src/jalview/schemabinding/version2/descriptors/ViewportDescriptor.java b/src/jalview/schemabinding/version2/descriptors/ViewportDescriptor.java
index f1fe49e..4faa6c1 100644 (file)
--- a/src/jalview/schemabinding/version2/descriptors/ViewportDescriptor.java
+++ b/src/jalview/schemabinding/version2/descriptors/ViewportDescriptor.java
@@ -45,11 +45,6 @@ public class ViewportDescriptor extends org.exolab.castor.xml.util.XMLClassDescr
      */\r
     private java.lang.String _xmlName;\r
 \r
-    /**\r
-     * Field _identity.\r
-     */\r
-    private org.exolab.castor.xml.XMLFieldDescriptor _identity;\r
-\r
 \r
       //----------------/\r
      //- Constructors -/\r
@@ -1406,7 +1401,7 @@ public class ViewportDescriptor extends org.exolab.castor.xml.util.XMLClassDescr
      */\r
     public org.exolab.castor.mapping.FieldDescriptor getIdentity(\r
     ) {\r
-        return _identity;\r
+        return super.getIdentity();\r
     }\r
 \r
     /**\r

diff --git a/utils/castor-1.1-codegen.jar b/utils/castor-1.1-codegen.jar
deleted file mode 100644 (file)
index d8fbb88..0000000
Binary files a/utils/castor-1.1-codegen.jar and /dev/null differ

diff --git a/utils/castor-1.1-codegen-anttask.jar b/utils/castor-1.1-cycle-codegen-anttask.jar
similarity index 86%
rename from utils/castor-1.1-codegen-anttask.jar
rename to utils/castor-1.1-cycle-codegen-anttask.jar
index 16287b5..5c59416 100644 (file)
Binary files a/utils/castor-1.1-codegen-anttask.jar and b/utils/castor-1.1-cycle-codegen-anttask.jar differ

diff --git a/utils/castor-1.1-cycle-codegen.jar b/utils/castor-1.1-cycle-codegen.jar
new file mode 100644 (file)
index 0000000..74ad927
Binary files /dev/null and b/utils/castor-1.1-cycle-codegen.jar differ