New Upstream Snapshot - libvamsas-client-java
Ready changes
Summary
Merged new upstream version: 0.2+git20100219.2.1b42648+dfsg (was: 0.2+git20100219.1.1b42648+dfsg).
Resulting package
Built on 2023-01-19T12:22 (took 5m31s)
The resulting binary packages can be installed (if you have the apt repository enabled) by running one of:
apt install -t fresh-snapshots libvamsas-client-java
Diff
diff --git a/debian/changelog b/debian/changelog
index 19fbaa0..a8ca477 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+libvamsas-client-java (0.2+git20100219.2.1b42648+dfsg-1) UNRELEASED; urgency=low
+
+ * New upstream snapshot.
+ * New upstream snapshot.
+
+ -- Debian Janitor <janitor@jelmer.uk> Thu, 19 Jan 2023 12:19:43 -0000
+
libvamsas-client-java (0.2+dfsg-2) unstable; urgency=medium
* Upload to unstable
diff --git a/debian/patches/build.patch b/debian/patches/build.patch
index 6ba4844..1805238 100644
--- a/debian/patches/build.patch
+++ b/debian/patches/build.patch
@@ -3,8 +3,10 @@ Author: Pierre Gruet <pgt@debian.org>
Forwarded: not-needed
Last-Update: 2021-04-12
---- a/build.xml
-+++ b/build.xml
+Index: libvamsas-client-java.git/build.xml
+===================================================================
+--- libvamsas-client-java.git.orig/build.xml
++++ libvamsas-client-java.git/build.xml
@@ -24,7 +24,7 @@
<target name="init">
diff --git a/debian/patches/castor-util-to-castor-core-utils.diff b/debian/patches/castor-util-to-castor-core-utils.diff
index b587152..5d0b96a 100644
--- a/debian/patches/castor-util-to-castor-core-utils.diff
+++ b/debian/patches/castor-util-to-castor-core-utils.diff
@@ -8,11 +8,11 @@ Description: 1.3.1 castor packages use castor.core.util in stead of
find src | perl -pi -e 's/castor\.util/castor.core.util/g'
-Index: libvamsas-client-java-0.2+git2011.10.17+1b42648/src/uk/ac/vamsas/objects/core/AlignmentAnnotation.java
+Index: libvamsas-client-java.git/src/uk/ac/vamsas/objects/core/AlignmentAnnotation.java
===================================================================
---- libvamsas-client-java-0.2+git2011.10.17+1b42648.orig/src/uk/ac/vamsas/objects/core/AlignmentAnnotation.java 2011-10-17 23:31:53.000000000 +0200
-+++ libvamsas-client-java-0.2+git2011.10.17+1b42648/src/uk/ac/vamsas/objects/core/AlignmentAnnotation.java 2011-10-17 23:43:32.628672117 +0200
-@@ -143,27 +143,27 @@
+--- libvamsas-client-java.git.orig/src/uk/ac/vamsas/objects/core/AlignmentAnnotation.java
++++ libvamsas-client-java.git/src/uk/ac/vamsas/objects/core/AlignmentAnnotation.java
+@@ -143,27 +143,27 @@ public class AlignmentAnnotation extends
if (temp._seqrefs == null)
return false;
if (this._seqrefs != temp._seqrefs) {
@@ -48,7 +48,7 @@ Index: libvamsas-client-java-0.2+git2011.10.17+1b42648/src/uk/ac/vamsas/objects/
}
}
} else if (temp._seqrefs != null)
-@@ -172,29 +172,29 @@
+@@ -172,29 +172,29 @@ public class AlignmentAnnotation extends
if (temp._provenance == null)
return false;
if (this._provenance != temp._provenance) {
@@ -86,7 +86,7 @@ Index: libvamsas-client-java-0.2+git2011.10.17+1b42648/src/uk/ac/vamsas/objects/
}
}
} else if (temp._provenance != null)
-@@ -299,14 +299,14 @@
+@@ -299,14 +299,14 @@ public class AlignmentAnnotation extends
long tmp;
result = 37 * result + (_graph ? 0 : 1);
if (_seqrefs != null
@@ -105,11 +105,11 @@ Index: libvamsas-client-java-0.2+git2011.10.17+1b42648/src/uk/ac/vamsas/objects/
}
return result;
-Index: libvamsas-client-java-0.2+git2011.10.17+1b42648/src/uk/ac/vamsas/objects/core/AlignmentSequenceAnnotation.java
+Index: libvamsas-client-java.git/src/uk/ac/vamsas/objects/core/AlignmentSequenceAnnotation.java
===================================================================
---- libvamsas-client-java-0.2+git2011.10.17+1b42648.orig/src/uk/ac/vamsas/objects/core/AlignmentSequenceAnnotation.java 2011-10-17 23:31:53.000000000 +0200
-+++ libvamsas-client-java-0.2+git2011.10.17+1b42648/src/uk/ac/vamsas/objects/core/AlignmentSequenceAnnotation.java 2011-10-17 23:43:32.624672117 +0200
-@@ -101,29 +101,29 @@
+--- libvamsas-client-java.git.orig/src/uk/ac/vamsas/objects/core/AlignmentSequenceAnnotation.java
++++ libvamsas-client-java.git/src/uk/ac/vamsas/objects/core/AlignmentSequenceAnnotation.java
+@@ -101,29 +101,29 @@ public class AlignmentSequenceAnnotation
if (temp._provenance == null)
return false;
if (this._provenance != temp._provenance) {
@@ -147,7 +147,7 @@ Index: libvamsas-client-java-0.2+git2011.10.17+1b42648/src/uk/ac/vamsas/objects/
}
}
} else if (temp._provenance != null)
-@@ -177,9 +177,9 @@
+@@ -177,9 +177,9 @@ public class AlignmentSequenceAnnotation
long tmp;
result = 37 * result + (_graph ? 0 : 1);
if (_provenance != null
@@ -159,11 +159,11 @@ Index: libvamsas-client-java-0.2+git2011.10.17+1b42648/src/uk/ac/vamsas/objects/
}
return result;
-Index: libvamsas-client-java-0.2+git2011.10.17+1b42648/src/uk/ac/vamsas/objects/core/AppData.java
+Index: libvamsas-client-java.git/src/uk/ac/vamsas/objects/core/AppData.java
===================================================================
---- libvamsas-client-java-0.2+git2011.10.17+1b42648.orig/src/uk/ac/vamsas/objects/core/AppData.java 2011-10-17 23:31:53.000000000 +0200
-+++ libvamsas-client-java-0.2+git2011.10.17+1b42648/src/uk/ac/vamsas/objects/core/AppData.java 2011-10-17 23:43:32.644672117 +0200
-@@ -89,18 +89,18 @@
+--- libvamsas-client-java.git.orig/src/uk/ac/vamsas/objects/core/AppData.java
++++ libvamsas-client-java.git/src/uk/ac/vamsas/objects/core/AppData.java
+@@ -89,18 +89,18 @@ public class AppData extends uk.ac.vamsa
if (temp._choiceValue == null)
return false;
if (this._choiceValue != temp._choiceValue) {
@@ -186,7 +186,7 @@ Index: libvamsas-client-java-0.2+git2011.10.17+1b42648/src/uk/ac/vamsas/objects/
.releaseCycleHandle(temp._choiceValue);
}
;
-@@ -108,14 +108,14 @@
+@@ -108,14 +108,14 @@ public class AppData extends uk.ac.vamsa
}
if (!thcycle) {
if (!this._choiceValue.equals(temp._choiceValue)) {
@@ -205,7 +205,7 @@ Index: libvamsas-client-java-0.2+git2011.10.17+1b42648/src/uk/ac/vamsas/objects/
}
}
} else if (temp._choiceValue != null)
-@@ -124,27 +124,27 @@
+@@ -124,27 +124,27 @@ public class AppData extends uk.ac.vamsa
if (temp._data == null)
return false;
if (this._data != temp._data) {
@@ -241,7 +241,7 @@ Index: libvamsas-client-java-0.2+git2011.10.17+1b42648/src/uk/ac/vamsas/objects/
}
}
} else if (temp._data != null)
-@@ -153,18 +153,18 @@
+@@ -153,18 +153,18 @@ public class AppData extends uk.ac.vamsa
if (temp._dataReference == null)
return false;
if (this._dataReference != temp._dataReference) {
@@ -264,7 +264,7 @@ Index: libvamsas-client-java-0.2+git2011.10.17+1b42648/src/uk/ac/vamsas/objects/
.releaseCycleHandle(temp._dataReference);
}
;
-@@ -172,15 +172,15 @@
+@@ -172,15 +172,15 @@ public class AppData extends uk.ac.vamsa
}
if (!thcycle) {
if (!this._dataReference.equals(temp._dataReference)) {
@@ -284,7 +284,7 @@ Index: libvamsas-client-java-0.2+git2011.10.17+1b42648/src/uk/ac/vamsas/objects/
.releaseCycleHandle(temp._dataReference);
}
}
-@@ -232,18 +232,18 @@
+@@ -232,18 +232,18 @@ public class AppData extends uk.ac.vamsa
long tmp;
if (_choiceValue != null
@@ -309,11 +309,11 @@ Index: libvamsas-client-java-0.2+git2011.10.17+1b42648/src/uk/ac/vamsas/objects/
}
return result;
-Index: libvamsas-client-java-0.2+git2011.10.17+1b42648/src/uk/ac/vamsas/objects/core/Attachment.java
+Index: libvamsas-client-java.git/src/uk/ac/vamsas/objects/core/Attachment.java
===================================================================
---- libvamsas-client-java-0.2+git2011.10.17+1b42648.orig/src/uk/ac/vamsas/objects/core/Attachment.java 2011-10-17 23:31:53.000000000 +0200
-+++ libvamsas-client-java-0.2+git2011.10.17+1b42648/src/uk/ac/vamsas/objects/core/Attachment.java 2011-10-17 23:43:32.624672117 +0200
-@@ -112,27 +112,27 @@
+--- libvamsas-client-java.git.orig/src/uk/ac/vamsas/objects/core/Attachment.java
++++ libvamsas-client-java.git/src/uk/ac/vamsas/objects/core/Attachment.java
+@@ -112,27 +112,27 @@ public class Attachment extends uk.ac.va
if (temp._type == null)
return false;
if (this._type != temp._type) {
@@ -349,7 +349,7 @@ Index: libvamsas-client-java-0.2+git2011.10.17+1b42648/src/uk/ac/vamsas/objects/
}
}
} else if (temp._type != null)
-@@ -141,29 +141,29 @@
+@@ -141,29 +141,29 @@ public class Attachment extends uk.ac.va
if (temp._objectref == null)
return false;
if (this._objectref != temp._objectref) {
@@ -387,7 +387,7 @@ Index: libvamsas-client-java-0.2+git2011.10.17+1b42648/src/uk/ac/vamsas/objects/
}
}
} else if (temp._objectref != null)
-@@ -172,27 +172,27 @@
+@@ -172,27 +172,27 @@ public class Attachment extends uk.ac.va
if (temp._id == null)
return false;
if (this._id != temp._id) {
@@ -423,7 +423,7 @@ Index: libvamsas-client-java-0.2+git2011.10.17+1b42648/src/uk/ac/vamsas/objects/
}
}
} else if (temp._id != null)
-@@ -268,18 +268,18 @@
+@@ -268,18 +268,18 @@ public class Attachment extends uk.ac.va
long tmp;
result = 37 * result + (_compressed ? 0 : 1);
@@ -448,11 +448,11 @@ Index: libvamsas-client-java-0.2+git2011.10.17+1b42648/src/uk/ac/vamsas/objects/
}
return result;
-Index: libvamsas-client-java-0.2+git2011.10.17+1b42648/src/uk/ac/vamsas/objects/core/Glyph.java
+Index: libvamsas-client-java.git/src/uk/ac/vamsas/objects/core/Glyph.java
===================================================================
---- libvamsas-client-java-0.2+git2011.10.17+1b42648.orig/src/uk/ac/vamsas/objects/core/Glyph.java 2011-10-17 23:31:53.000000000 +0200
-+++ libvamsas-client-java-0.2+git2011.10.17+1b42648/src/uk/ac/vamsas/objects/core/Glyph.java 2011-10-17 23:43:32.628672117 +0200
-@@ -89,27 +89,27 @@
+--- libvamsas-client-java.git.orig/src/uk/ac/vamsas/objects/core/Glyph.java
++++ libvamsas-client-java.git/src/uk/ac/vamsas/objects/core/Glyph.java
+@@ -89,27 +89,27 @@ public class Glyph extends uk.ac.vamsas.
if (temp._content == null)
return false;
if (this._content != temp._content) {
@@ -488,7 +488,7 @@ Index: libvamsas-client-java-0.2+git2011.10.17+1b42648/src/uk/ac/vamsas/objects/
}
}
} else if (temp._content != null)
-@@ -118,27 +118,27 @@
+@@ -118,27 +118,27 @@ public class Glyph extends uk.ac.vamsas.
if (temp._dict == null)
return false;
if (this._dict != temp._dict) {
@@ -524,7 +524,7 @@ Index: libvamsas-client-java-0.2+git2011.10.17+1b42648/src/uk/ac/vamsas/objects/
}
}
} else if (temp._dict != null)
-@@ -183,13 +183,13 @@
+@@ -183,13 +183,13 @@ public class Glyph extends uk.ac.vamsas.
long tmp;
if (_content != null
@@ -542,11 +542,11 @@ Index: libvamsas-client-java-0.2+git2011.10.17+1b42648/src/uk/ac/vamsas/objects/
}
return result;
-Index: libvamsas-client-java-0.2+git2011.10.17+1b42648/src/uk/ac/vamsas/objects/core/Input.java
+Index: libvamsas-client-java.git/src/uk/ac/vamsas/objects/core/Input.java
===================================================================
---- libvamsas-client-java-0.2+git2011.10.17+1b42648.orig/src/uk/ac/vamsas/objects/core/Input.java 2011-10-17 23:31:53.000000000 +0200
-+++ libvamsas-client-java-0.2+git2011.10.17+1b42648/src/uk/ac/vamsas/objects/core/Input.java 2011-10-17 23:43:32.640672117 +0200
-@@ -120,27 +120,27 @@
+--- libvamsas-client-java.git.orig/src/uk/ac/vamsas/objects/core/Input.java
++++ libvamsas-client-java.git/src/uk/ac/vamsas/objects/core/Input.java
+@@ -120,27 +120,27 @@ public class Input extends uk.ac.vamsas.
if (temp._name == null)
return false;
if (this._name != temp._name) {
@@ -582,7 +582,7 @@ Index: libvamsas-client-java-0.2+git2011.10.17+1b42648/src/uk/ac/vamsas/objects/
}
}
} else if (temp._name != null)
-@@ -149,27 +149,27 @@
+@@ -149,27 +149,27 @@ public class Input extends uk.ac.vamsas.
if (temp._objRef == null)
return false;
if (this._objRef != temp._objRef) {
@@ -618,7 +618,7 @@ Index: libvamsas-client-java-0.2+git2011.10.17+1b42648/src/uk/ac/vamsas/objects/
}
}
} else if (temp._objRef != null)
-@@ -252,14 +252,14 @@
+@@ -252,14 +252,14 @@ public class Input extends uk.ac.vamsas.
int result = super.hashCode();
long tmp;
@@ -637,11 +637,11 @@ Index: libvamsas-client-java-0.2+git2011.10.17+1b42648/src/uk/ac/vamsas/objects/
}
return result;
-Index: libvamsas-client-java-0.2+git2011.10.17+1b42648/src/uk/ac/vamsas/objects/core/Instance.java
+Index: libvamsas-client-java.git/src/uk/ac/vamsas/objects/core/Instance.java
===================================================================
---- libvamsas-client-java-0.2+git2011.10.17+1b42648.orig/src/uk/ac/vamsas/objects/core/Instance.java 2011-10-17 23:31:53.000000000 +0200
-+++ libvamsas-client-java-0.2+git2011.10.17+1b42648/src/uk/ac/vamsas/objects/core/Instance.java 2011-10-17 23:43:32.640672117 +0200
-@@ -79,27 +79,27 @@
+--- libvamsas-client-java.git.orig/src/uk/ac/vamsas/objects/core/Instance.java
++++ libvamsas-client-java.git/src/uk/ac/vamsas/objects/core/Instance.java
+@@ -79,27 +79,27 @@ public class Instance extends uk.ac.vams
if (temp._urn == null)
return false;
if (this._urn != temp._urn) {
@@ -677,7 +677,7 @@ Index: libvamsas-client-java-0.2+git2011.10.17+1b42648/src/uk/ac/vamsas/objects/
}
}
} else if (temp._urn != null)
-@@ -130,9 +130,9 @@
+@@ -130,9 +130,9 @@ public class Instance extends uk.ac.vams
int result = super.hashCode();
long tmp;
@@ -689,11 +689,11 @@ Index: libvamsas-client-java-0.2+git2011.10.17+1b42648/src/uk/ac/vamsas/objects/
}
return result;
-Index: libvamsas-client-java-0.2+git2011.10.17+1b42648/src/uk/ac/vamsas/objects/core/Link.java
+Index: libvamsas-client-java.git/src/uk/ac/vamsas/objects/core/Link.java
===================================================================
---- libvamsas-client-java-0.2+git2011.10.17+1b42648.orig/src/uk/ac/vamsas/objects/core/Link.java 2011-10-17 23:31:53.000000000 +0200
-+++ libvamsas-client-java-0.2+git2011.10.17+1b42648/src/uk/ac/vamsas/objects/core/Link.java 2011-10-17 23:43:32.640672117 +0200
-@@ -85,27 +85,27 @@
+--- libvamsas-client-java.git.orig/src/uk/ac/vamsas/objects/core/Link.java
++++ libvamsas-client-java.git/src/uk/ac/vamsas/objects/core/Link.java
+@@ -85,27 +85,27 @@ public class Link extends uk.ac.vamsas.c
if (temp._content == null)
return false;
if (this._content != temp._content) {
@@ -729,7 +729,7 @@ Index: libvamsas-client-java-0.2+git2011.10.17+1b42648/src/uk/ac/vamsas/objects/
}
}
} else if (temp._content != null)
-@@ -114,27 +114,27 @@
+@@ -114,27 +114,27 @@ public class Link extends uk.ac.vamsas.c
if (temp._href == null)
return false;
if (this._href != temp._href) {
@@ -765,7 +765,7 @@ Index: libvamsas-client-java-0.2+git2011.10.17+1b42648/src/uk/ac/vamsas/objects/
}
}
} else if (temp._href != null)
-@@ -177,13 +177,13 @@
+@@ -177,13 +177,13 @@ public class Link extends uk.ac.vamsas.c
long tmp;
if (_content != null
@@ -783,11 +783,11 @@ Index: libvamsas-client-java-0.2+git2011.10.17+1b42648/src/uk/ac/vamsas/objects/
}
return result;
-Index: libvamsas-client-java-0.2+git2011.10.17+1b42648/src/uk/ac/vamsas/objects/core/Map.java
+Index: libvamsas-client-java.git/src/uk/ac/vamsas/objects/core/Map.java
===================================================================
---- libvamsas-client-java-0.2+git2011.10.17+1b42648.orig/src/uk/ac/vamsas/objects/core/Map.java 2011-10-17 23:31:53.000000000 +0200
-+++ libvamsas-client-java-0.2+git2011.10.17+1b42648/src/uk/ac/vamsas/objects/core/Map.java 2011-10-17 23:43:32.628672117 +0200
-@@ -85,27 +85,27 @@
+--- libvamsas-client-java.git.orig/src/uk/ac/vamsas/objects/core/Map.java
++++ libvamsas-client-java.git/src/uk/ac/vamsas/objects/core/Map.java
+@@ -85,27 +85,27 @@ public class Map extends uk.ac.vamsas.ob
if (temp._id == null)
return false;
if (this._id != temp._id) {
@@ -823,7 +823,7 @@ Index: libvamsas-client-java-0.2+git2011.10.17+1b42648/src/uk/ac/vamsas/objects/
}
}
} else if (temp._id != null)
-@@ -136,9 +136,9 @@
+@@ -136,9 +136,9 @@ public class Map extends uk.ac.vamsas.ob
int result = super.hashCode();
long tmp;
@@ -835,11 +835,11 @@ Index: libvamsas-client-java-0.2+git2011.10.17+1b42648/src/uk/ac/vamsas/objects/
}
return result;
-Index: libvamsas-client-java-0.2+git2011.10.17+1b42648/src/uk/ac/vamsas/objects/core/MapType.java
+Index: libvamsas-client-java.git/src/uk/ac/vamsas/objects/core/MapType.java
===================================================================
---- libvamsas-client-java-0.2+git2011.10.17+1b42648.orig/src/uk/ac/vamsas/objects/core/MapType.java 2011-10-17 23:31:53.000000000 +0200
-+++ libvamsas-client-java-0.2+git2011.10.17+1b42648/src/uk/ac/vamsas/objects/core/MapType.java 2011-10-17 23:43:32.632672117 +0200
-@@ -83,27 +83,27 @@
+--- libvamsas-client-java.git.orig/src/uk/ac/vamsas/objects/core/MapType.java
++++ libvamsas-client-java.git/src/uk/ac/vamsas/objects/core/MapType.java
+@@ -83,27 +83,27 @@ public class MapType extends uk.ac.vamsa
if (temp._local == null)
return false;
if (this._local != temp._local) {
@@ -875,7 +875,7 @@ Index: libvamsas-client-java-0.2+git2011.10.17+1b42648/src/uk/ac/vamsas/objects/
}
}
} else if (temp._local != null)
-@@ -112,27 +112,27 @@
+@@ -112,27 +112,27 @@ public class MapType extends uk.ac.vamsa
if (temp._mapped == null)
return false;
if (this._mapped != temp._mapped) {
@@ -911,7 +911,7 @@ Index: libvamsas-client-java-0.2+git2011.10.17+1b42648/src/uk/ac/vamsas/objects/
}
}
} else if (temp._mapped != null)
-@@ -172,14 +172,14 @@
+@@ -172,14 +172,14 @@ public class MapType extends uk.ac.vamsa
int result = super.hashCode();
long tmp;
@@ -930,11 +930,11 @@ Index: libvamsas-client-java-0.2+git2011.10.17+1b42648/src/uk/ac/vamsas/objects/
}
return result;
-Index: libvamsas-client-java-0.2+git2011.10.17+1b42648/src/uk/ac/vamsas/objects/core/NodeType.java
+Index: libvamsas-client-java.git/src/uk/ac/vamsas/objects/core/NodeType.java
===================================================================
---- libvamsas-client-java-0.2+git2011.10.17+1b42648.orig/src/uk/ac/vamsas/objects/core/NodeType.java 2011-10-17 23:31:53.000000000 +0200
-+++ libvamsas-client-java-0.2+git2011.10.17+1b42648/src/uk/ac/vamsas/objects/core/NodeType.java 2011-10-17 23:43:32.628672117 +0200
-@@ -176,27 +176,27 @@
+--- libvamsas-client-java.git.orig/src/uk/ac/vamsas/objects/core/NodeType.java
++++ libvamsas-client-java.git/src/uk/ac/vamsas/objects/core/NodeType.java
+@@ -176,27 +176,27 @@ public class NodeType extends uk.ac.vams
if (temp._id == null)
return false;
if (this._id != temp._id) {
@@ -970,7 +970,7 @@ Index: libvamsas-client-java-0.2+git2011.10.17+1b42648/src/uk/ac/vamsas/objects/
}
}
} else if (temp._id != null)
-@@ -205,29 +205,29 @@
+@@ -205,29 +205,29 @@ public class NodeType extends uk.ac.vams
if (temp._modifiable == null)
return false;
if (this._modifiable != temp._modifiable) {
@@ -1008,7 +1008,7 @@ Index: libvamsas-client-java-0.2+git2011.10.17+1b42648/src/uk/ac/vamsas/objects/
}
}
} else if (temp._modifiable != null)
-@@ -236,27 +236,27 @@
+@@ -236,27 +236,27 @@ public class NodeType extends uk.ac.vams
if (temp._name == null)
return false;
if (this._name != temp._name) {
@@ -1044,7 +1044,7 @@ Index: libvamsas-client-java-0.2+git2011.10.17+1b42648/src/uk/ac/vamsas/objects/
}
}
} else if (temp._name != null)
-@@ -265,18 +265,18 @@
+@@ -265,18 +265,18 @@ public class NodeType extends uk.ac.vams
if (temp._description == null)
return false;
if (this._description != temp._description) {
@@ -1067,7 +1067,7 @@ Index: libvamsas-client-java-0.2+git2011.10.17+1b42648/src/uk/ac/vamsas/objects/
.releaseCycleHandle(temp._description);
}
;
-@@ -284,14 +284,14 @@
+@@ -284,14 +284,14 @@ public class NodeType extends uk.ac.vams
}
if (!thcycle) {
if (!this._description.equals(temp._description)) {
@@ -1086,7 +1086,7 @@ Index: libvamsas-client-java-0.2+git2011.10.17+1b42648/src/uk/ac/vamsas/objects/
}
}
} else if (temp._description != null)
-@@ -300,29 +300,29 @@
+@@ -300,29 +300,29 @@ public class NodeType extends uk.ac.vams
if (temp._vrefList == null)
return false;
if (this._vrefList != temp._vrefList) {
@@ -1124,7 +1124,7 @@ Index: libvamsas-client-java-0.2+git2011.10.17+1b42648/src/uk/ac/vamsas/objects/
}
}
} else if (temp._vrefList != null)
-@@ -331,18 +331,18 @@
+@@ -331,18 +331,18 @@ public class NodeType extends uk.ac.vams
if (temp._propertyList == null)
return false;
if (this._propertyList != temp._propertyList) {
@@ -1147,7 +1147,7 @@ Index: libvamsas-client-java-0.2+git2011.10.17+1b42648/src/uk/ac/vamsas/objects/
.releaseCycleHandle(temp._propertyList);
}
;
-@@ -350,14 +350,14 @@
+@@ -350,14 +350,14 @@ public class NodeType extends uk.ac.vams
}
if (!thcycle) {
if (!this._propertyList.equals(temp._propertyList)) {
@@ -1166,7 +1166,7 @@ Index: libvamsas-client-java-0.2+git2011.10.17+1b42648/src/uk/ac/vamsas/objects/
}
}
} else if (temp._propertyList != null)
-@@ -524,33 +524,33 @@
+@@ -524,33 +524,33 @@ public class NodeType extends uk.ac.vams
int result = super.hashCode();
long tmp;
@@ -1212,11 +1212,11 @@ Index: libvamsas-client-java-0.2+git2011.10.17+1b42648/src/uk/ac/vamsas/objects/
}
return result;
-Index: libvamsas-client-java-0.2+git2011.10.17+1b42648/src/uk/ac/vamsas/objects/core/Param.java
+Index: libvamsas-client-java.git/src/uk/ac/vamsas/objects/core/Param.java
===================================================================
---- libvamsas-client-java-0.2+git2011.10.17+1b42648.orig/src/uk/ac/vamsas/objects/core/Param.java 2011-10-17 23:31:53.000000000 +0200
-+++ libvamsas-client-java-0.2+git2011.10.17+1b42648/src/uk/ac/vamsas/objects/core/Param.java 2011-10-17 23:43:32.628672117 +0200
-@@ -92,27 +92,27 @@
+--- libvamsas-client-java.git.orig/src/uk/ac/vamsas/objects/core/Param.java
++++ libvamsas-client-java.git/src/uk/ac/vamsas/objects/core/Param.java
+@@ -92,27 +92,27 @@ public class Param extends uk.ac.vamsas.
if (temp._content == null)
return false;
if (this._content != temp._content) {
@@ -1252,7 +1252,7 @@ Index: libvamsas-client-java-0.2+git2011.10.17+1b42648/src/uk/ac/vamsas/objects/
}
}
} else if (temp._content != null)
-@@ -121,27 +121,27 @@
+@@ -121,27 +121,27 @@ public class Param extends uk.ac.vamsas.
if (temp._name == null)
return false;
if (this._name != temp._name) {
@@ -1288,7 +1288,7 @@ Index: libvamsas-client-java-0.2+git2011.10.17+1b42648/src/uk/ac/vamsas/objects/
}
}
} else if (temp._name != null)
-@@ -150,27 +150,27 @@
+@@ -150,27 +150,27 @@ public class Param extends uk.ac.vamsas.
if (temp._type == null)
return false;
if (this._type != temp._type) {
@@ -1324,7 +1324,7 @@ Index: libvamsas-client-java-0.2+git2011.10.17+1b42648/src/uk/ac/vamsas/objects/
}
}
} else if (temp._type != null)
-@@ -224,17 +224,17 @@
+@@ -224,17 +224,17 @@ public class Param extends uk.ac.vamsas.
long tmp;
if (_content != null
@@ -1348,11 +1348,11 @@ Index: libvamsas-client-java-0.2+git2011.10.17+1b42648/src/uk/ac/vamsas/objects/
}
return result;
-Index: libvamsas-client-java-0.2+git2011.10.17+1b42648/src/uk/ac/vamsas/objects/core/Property.java
+Index: libvamsas-client-java.git/src/uk/ac/vamsas/objects/core/Property.java
===================================================================
---- libvamsas-client-java-0.2+git2011.10.17+1b42648.orig/src/uk/ac/vamsas/objects/core/Property.java 2011-10-17 23:31:53.000000000 +0200
-+++ libvamsas-client-java-0.2+git2011.10.17+1b42648/src/uk/ac/vamsas/objects/core/Property.java 2011-10-17 23:43:32.628672117 +0200
-@@ -92,27 +92,27 @@
+--- libvamsas-client-java.git.orig/src/uk/ac/vamsas/objects/core/Property.java
++++ libvamsas-client-java.git/src/uk/ac/vamsas/objects/core/Property.java
+@@ -92,27 +92,27 @@ public class Property extends uk.ac.vams
if (temp._content == null)
return false;
if (this._content != temp._content) {
@@ -1388,7 +1388,7 @@ Index: libvamsas-client-java-0.2+git2011.10.17+1b42648/src/uk/ac/vamsas/objects/
}
}
} else if (temp._content != null)
-@@ -121,27 +121,27 @@
+@@ -121,27 +121,27 @@ public class Property extends uk.ac.vams
if (temp._name == null)
return false;
if (this._name != temp._name) {
@@ -1424,7 +1424,7 @@ Index: libvamsas-client-java-0.2+git2011.10.17+1b42648/src/uk/ac/vamsas/objects/
}
}
} else if (temp._name != null)
-@@ -150,27 +150,27 @@
+@@ -150,27 +150,27 @@ public class Property extends uk.ac.vams
if (temp._type == null)
return false;
if (this._type != temp._type) {
@@ -1460,7 +1460,7 @@ Index: libvamsas-client-java-0.2+git2011.10.17+1b42648/src/uk/ac/vamsas/objects/
}
}
} else if (temp._type != null)
-@@ -224,17 +224,17 @@
+@@ -224,17 +224,17 @@ public class Property extends uk.ac.vams
long tmp;
if (_content != null
@@ -1484,11 +1484,11 @@ Index: libvamsas-client-java-0.2+git2011.10.17+1b42648/src/uk/ac/vamsas/objects/
}
return result;
-Index: libvamsas-client-java-0.2+git2011.10.17+1b42648/src/uk/ac/vamsas/objects/core/RangeAnnotation.java
+Index: libvamsas-client-java.git/src/uk/ac/vamsas/objects/core/RangeAnnotation.java
===================================================================
---- libvamsas-client-java-0.2+git2011.10.17+1b42648.orig/src/uk/ac/vamsas/objects/core/RangeAnnotation.java 2011-10-17 23:31:53.000000000 +0200
-+++ libvamsas-client-java-0.2+git2011.10.17+1b42648/src/uk/ac/vamsas/objects/core/RangeAnnotation.java 2011-10-17 23:43:32.644672117 +0200
-@@ -288,27 +288,27 @@
+--- libvamsas-client-java.git.orig/src/uk/ac/vamsas/objects/core/RangeAnnotation.java
++++ libvamsas-client-java.git/src/uk/ac/vamsas/objects/core/RangeAnnotation.java
+@@ -288,27 +288,27 @@ public class RangeAnnotation extends uk.
if (temp._id == null)
return false;
if (this._id != temp._id) {
@@ -1524,7 +1524,7 @@ Index: libvamsas-client-java-0.2+git2011.10.17+1b42648/src/uk/ac/vamsas/objects/
}
}
} else if (temp._id != null)
-@@ -317,29 +317,29 @@
+@@ -317,29 +317,29 @@ public class RangeAnnotation extends uk.
if (temp._modifiable == null)
return false;
if (this._modifiable != temp._modifiable) {
@@ -1562,7 +1562,7 @@ Index: libvamsas-client-java-0.2+git2011.10.17+1b42648/src/uk/ac/vamsas/objects/
}
}
} else if (temp._modifiable != null)
-@@ -348,27 +348,27 @@
+@@ -348,27 +348,27 @@ public class RangeAnnotation extends uk.
if (temp._group == null)
return false;
if (this._group != temp._group) {
@@ -1598,7 +1598,7 @@ Index: libvamsas-client-java-0.2+git2011.10.17+1b42648/src/uk/ac/vamsas/objects/
}
}
} else if (temp._group != null)
-@@ -377,27 +377,27 @@
+@@ -377,27 +377,27 @@ public class RangeAnnotation extends uk.
if (temp._type == null)
return false;
if (this._type != temp._type) {
@@ -1634,7 +1634,7 @@ Index: libvamsas-client-java-0.2+git2011.10.17+1b42648/src/uk/ac/vamsas/objects/
}
}
} else if (temp._type != null)
-@@ -406,27 +406,27 @@
+@@ -406,27 +406,27 @@ public class RangeAnnotation extends uk.
if (temp._label == null)
return false;
if (this._label != temp._label) {
@@ -1670,7 +1670,7 @@ Index: libvamsas-client-java-0.2+git2011.10.17+1b42648/src/uk/ac/vamsas/objects/
}
}
} else if (temp._label != null)
-@@ -435,18 +435,18 @@
+@@ -435,18 +435,18 @@ public class RangeAnnotation extends uk.
if (temp._description == null)
return false;
if (this._description != temp._description) {
@@ -1693,7 +1693,7 @@ Index: libvamsas-client-java-0.2+git2011.10.17+1b42648/src/uk/ac/vamsas/objects/
.releaseCycleHandle(temp._description);
}
;
-@@ -454,14 +454,14 @@
+@@ -454,14 +454,14 @@ public class RangeAnnotation extends uk.
}
if (!thcycle) {
if (!this._description.equals(temp._description)) {
@@ -1712,7 +1712,7 @@ Index: libvamsas-client-java-0.2+git2011.10.17+1b42648/src/uk/ac/vamsas/objects/
}
}
} else if (temp._description != null)
-@@ -470,27 +470,27 @@
+@@ -470,27 +470,27 @@ public class RangeAnnotation extends uk.
if (temp._status == null)
return false;
if (this._status != temp._status) {
@@ -1748,7 +1748,7 @@ Index: libvamsas-client-java-0.2+git2011.10.17+1b42648/src/uk/ac/vamsas/objects/
}
}
} else if (temp._status != null)
-@@ -499,18 +499,18 @@
+@@ -499,18 +499,18 @@ public class RangeAnnotation extends uk.
if (temp._annotationElementList == null)
return false;
if (this._annotationElementList != temp._annotationElementList) {
@@ -1771,7 +1771,7 @@ Index: libvamsas-client-java-0.2+git2011.10.17+1b42648/src/uk/ac/vamsas/objects/
.releaseCycleHandle(temp._annotationElementList);
}
;
-@@ -519,15 +519,15 @@
+@@ -519,15 +519,15 @@ public class RangeAnnotation extends uk.
if (!thcycle) {
if (!this._annotationElementList
.equals(temp._annotationElementList)) {
@@ -1791,7 +1791,7 @@ Index: libvamsas-client-java-0.2+git2011.10.17+1b42648/src/uk/ac/vamsas/objects/
.releaseCycleHandle(temp._annotationElementList);
}
}
-@@ -537,29 +537,29 @@
+@@ -537,29 +537,29 @@ public class RangeAnnotation extends uk.
if (temp._scoreList == null)
return false;
if (this._scoreList != temp._scoreList) {
@@ -1829,7 +1829,7 @@ Index: libvamsas-client-java-0.2+git2011.10.17+1b42648/src/uk/ac/vamsas/objects/
}
}
} else if (temp._scoreList != null)
-@@ -568,29 +568,29 @@
+@@ -568,29 +568,29 @@ public class RangeAnnotation extends uk.
if (temp._linkList == null)
return false;
if (this._linkList != temp._linkList) {
@@ -1867,7 +1867,7 @@ Index: libvamsas-client-java-0.2+git2011.10.17+1b42648/src/uk/ac/vamsas/objects/
}
}
} else if (temp._linkList != null)
-@@ -599,18 +599,18 @@
+@@ -599,18 +599,18 @@ public class RangeAnnotation extends uk.
if (temp._propertyList == null)
return false;
if (this._propertyList != temp._propertyList) {
@@ -1890,7 +1890,7 @@ Index: libvamsas-client-java-0.2+git2011.10.17+1b42648/src/uk/ac/vamsas/objects/
.releaseCycleHandle(temp._propertyList);
}
;
-@@ -618,14 +618,14 @@
+@@ -618,14 +618,14 @@ public class RangeAnnotation extends uk.
}
if (!thcycle) {
if (!this._propertyList.equals(temp._propertyList)) {
@@ -1909,7 +1909,7 @@ Index: libvamsas-client-java-0.2+git2011.10.17+1b42648/src/uk/ac/vamsas/objects/
}
}
} else if (temp._propertyList != null)
-@@ -942,57 +942,57 @@
+@@ -942,57 +942,57 @@ public class RangeAnnotation extends uk.
int result = super.hashCode();
long tmp;
@@ -1989,11 +1989,11 @@ Index: libvamsas-client-java-0.2+git2011.10.17+1b42648/src/uk/ac/vamsas/objects/
}
return result;
-Index: libvamsas-client-java-0.2+git2011.10.17+1b42648/src/uk/ac/vamsas/objects/core/RangeType.java
+Index: libvamsas-client-java.git/src/uk/ac/vamsas/objects/core/RangeType.java
===================================================================
---- libvamsas-client-java-0.2+git2011.10.17+1b42648.orig/src/uk/ac/vamsas/objects/core/RangeType.java 2011-10-17 23:31:53.000000000 +0200
-+++ libvamsas-client-java-0.2+git2011.10.17+1b42648/src/uk/ac/vamsas/objects/core/RangeType.java 2011-10-17 23:43:32.644672117 +0200
-@@ -157,18 +157,18 @@
+--- libvamsas-client-java.git.orig/src/uk/ac/vamsas/objects/core/RangeType.java
++++ libvamsas-client-java.git/src/uk/ac/vamsas/objects/core/RangeType.java
+@@ -157,18 +157,18 @@ public abstract class RangeType extends
if (temp._choiceValue == null)
return false;
if (this._choiceValue != temp._choiceValue) {
@@ -2016,7 +2016,7 @@ Index: libvamsas-client-java-0.2+git2011.10.17+1b42648/src/uk/ac/vamsas/objects/
.releaseCycleHandle(temp._choiceValue);
}
;
-@@ -176,14 +176,14 @@
+@@ -176,14 +176,14 @@ public abstract class RangeType extends
}
if (!thcycle) {
if (!this._choiceValue.equals(temp._choiceValue)) {
@@ -2035,7 +2035,7 @@ Index: libvamsas-client-java-0.2+git2011.10.17+1b42648/src/uk/ac/vamsas/objects/
}
}
} else if (temp._choiceValue != null)
-@@ -192,27 +192,27 @@
+@@ -192,27 +192,27 @@ public abstract class RangeType extends
if (temp._posList == null)
return false;
if (this._posList != temp._posList) {
@@ -2071,7 +2071,7 @@ Index: libvamsas-client-java-0.2+git2011.10.17+1b42648/src/uk/ac/vamsas/objects/
}
}
} else if (temp._posList != null)
-@@ -221,27 +221,27 @@
+@@ -221,27 +221,27 @@ public abstract class RangeType extends
if (temp._segList == null)
return false;
if (this._segList != temp._segList) {
@@ -2107,7 +2107,7 @@ Index: libvamsas-client-java-0.2+git2011.10.17+1b42648/src/uk/ac/vamsas/objects/
}
}
} else if (temp._segList != null)
-@@ -378,19 +378,19 @@
+@@ -378,19 +378,19 @@ public abstract class RangeType extends
long tmp;
if (_choiceValue != null
@@ -2133,11 +2133,11 @@ Index: libvamsas-client-java-0.2+git2011.10.17+1b42648/src/uk/ac/vamsas/objects/
}
return result;
-Index: libvamsas-client-java-0.2+git2011.10.17+1b42648/src/uk/ac/vamsas/objects/core/ReferenceType.java
+Index: libvamsas-client-java.git/src/uk/ac/vamsas/objects/core/ReferenceType.java
===================================================================
---- libvamsas-client-java-0.2+git2011.10.17+1b42648.orig/src/uk/ac/vamsas/objects/core/ReferenceType.java 2011-10-17 23:31:53.000000000 +0200
-+++ libvamsas-client-java-0.2+git2011.10.17+1b42648/src/uk/ac/vamsas/objects/core/ReferenceType.java 2011-10-17 23:43:32.640672117 +0200
-@@ -128,27 +128,27 @@
+--- libvamsas-client-java.git.orig/src/uk/ac/vamsas/objects/core/ReferenceType.java
++++ libvamsas-client-java.git/src/uk/ac/vamsas/objects/core/ReferenceType.java
+@@ -128,27 +128,27 @@ public class ReferenceType extends uk.ac
if (temp._content == null)
return false;
if (this._content != temp._content) {
@@ -2173,7 +2173,7 @@ Index: libvamsas-client-java-0.2+git2011.10.17+1b42648/src/uk/ac/vamsas/objects/
}
}
} else if (temp._content != null)
-@@ -157,27 +157,27 @@
+@@ -157,27 +157,27 @@ public class ReferenceType extends uk.ac
if (temp._id == null)
return false;
if (this._id != temp._id) {
@@ -2209,7 +2209,7 @@ Index: libvamsas-client-java-0.2+git2011.10.17+1b42648/src/uk/ac/vamsas/objects/
}
}
} else if (temp._id != null)
-@@ -186,27 +186,27 @@
+@@ -186,27 +186,27 @@ public class ReferenceType extends uk.ac
if (temp._refs == null)
return false;
if (this._refs != temp._refs) {
@@ -2245,7 +2245,7 @@ Index: libvamsas-client-java-0.2+git2011.10.17+1b42648/src/uk/ac/vamsas/objects/
}
}
} else if (temp._refs != null)
-@@ -302,17 +302,17 @@
+@@ -302,17 +302,17 @@ public class ReferenceType extends uk.ac
long tmp;
if (_content != null
@@ -2269,11 +2269,11 @@ Index: libvamsas-client-java-0.2+git2011.10.17+1b42648/src/uk/ac/vamsas/objects/
}
return result;
-Index: libvamsas-client-java-0.2+git2011.10.17+1b42648/src/uk/ac/vamsas/objects/core/Score.java
+Index: libvamsas-client-java.git/src/uk/ac/vamsas/objects/core/Score.java
===================================================================
---- libvamsas-client-java-0.2+git2011.10.17+1b42648.orig/src/uk/ac/vamsas/objects/core/Score.java 2011-10-17 23:31:53.000000000 +0200
-+++ libvamsas-client-java-0.2+git2011.10.17+1b42648/src/uk/ac/vamsas/objects/core/Score.java 2011-10-17 23:43:32.628672117 +0200
-@@ -100,27 +100,27 @@
+--- libvamsas-client-java.git.orig/src/uk/ac/vamsas/objects/core/Score.java
++++ libvamsas-client-java.git/src/uk/ac/vamsas/objects/core/Score.java
+@@ -100,27 +100,27 @@ public class Score extends uk.ac.vamsas.
if (temp._name == null)
return false;
if (this._name != temp._name) {
@@ -2309,7 +2309,7 @@ Index: libvamsas-client-java-0.2+git2011.10.17+1b42648/src/uk/ac/vamsas/objects/
}
}
} else if (temp._name != null)
-@@ -171,9 +171,9 @@
+@@ -171,9 +171,9 @@ public class Score extends uk.ac.vamsas.
long tmp;
result = 37 * result + java.lang.Float.floatToIntBits(_content);
@@ -2321,11 +2321,11 @@ Index: libvamsas-client-java-0.2+git2011.10.17+1b42648/src/uk/ac/vamsas/objects/
}
return result;
-Index: libvamsas-client-java-0.2+git2011.10.17+1b42648/src/uk/ac/vamsas/objects/core/SequenceMapping.java
+Index: libvamsas-client-java.git/src/uk/ac/vamsas/objects/core/SequenceMapping.java
===================================================================
---- libvamsas-client-java-0.2+git2011.10.17+1b42648.orig/src/uk/ac/vamsas/objects/core/SequenceMapping.java 2011-10-17 23:31:53.000000000 +0200
-+++ libvamsas-client-java-0.2+git2011.10.17+1b42648/src/uk/ac/vamsas/objects/core/SequenceMapping.java 2011-10-17 23:43:32.628672117 +0200
-@@ -94,27 +94,27 @@
+--- libvamsas-client-java.git.orig/src/uk/ac/vamsas/objects/core/SequenceMapping.java
++++ libvamsas-client-java.git/src/uk/ac/vamsas/objects/core/SequenceMapping.java
+@@ -94,27 +94,27 @@ public class SequenceMapping extends uk.
if (temp._loc == null)
return false;
if (this._loc != temp._loc) {
@@ -2361,7 +2361,7 @@ Index: libvamsas-client-java-0.2+git2011.10.17+1b42648/src/uk/ac/vamsas/objects/
}
}
} else if (temp._loc != null)
-@@ -123,27 +123,27 @@
+@@ -123,27 +123,27 @@ public class SequenceMapping extends uk.
if (temp._map == null)
return false;
if (this._map != temp._map) {
@@ -2397,7 +2397,7 @@ Index: libvamsas-client-java-0.2+git2011.10.17+1b42648/src/uk/ac/vamsas/objects/
}
}
} else if (temp._map != null)
-@@ -152,27 +152,27 @@
+@@ -152,27 +152,27 @@ public class SequenceMapping extends uk.
if (temp._id == null)
return false;
if (this._id != temp._id) {
@@ -2433,7 +2433,7 @@ Index: libvamsas-client-java-0.2+git2011.10.17+1b42648/src/uk/ac/vamsas/objects/
}
}
} else if (temp._id != null)
-@@ -181,29 +181,29 @@
+@@ -181,29 +181,29 @@ public class SequenceMapping extends uk.
if (temp._provenance == null)
return false;
if (this._provenance != temp._provenance) {
@@ -2471,7 +2471,7 @@ Index: libvamsas-client-java-0.2+git2011.10.17+1b42648/src/uk/ac/vamsas/objects/
}
}
} else if (temp._provenance != null)
-@@ -263,22 +263,22 @@
+@@ -263,22 +263,22 @@ public class SequenceMapping extends uk.
int result = super.hashCode();
long tmp;
@@ -2502,11 +2502,11 @@ Index: libvamsas-client-java-0.2+git2011.10.17+1b42648/src/uk/ac/vamsas/objects/
}
return result;
-Index: libvamsas-client-java-0.2+git2011.10.17+1b42648/src/uk/ac/vamsas/objects/core/Treenode.java
+Index: libvamsas-client-java.git/src/uk/ac/vamsas/objects/core/Treenode.java
===================================================================
---- libvamsas-client-java-0.2+git2011.10.17+1b42648.orig/src/uk/ac/vamsas/objects/core/Treenode.java 2011-10-17 23:31:53.000000000 +0200
-+++ libvamsas-client-java-0.2+git2011.10.17+1b42648/src/uk/ac/vamsas/objects/core/Treenode.java 2011-10-17 23:43:32.628672117 +0200
-@@ -122,27 +122,27 @@
+--- libvamsas-client-java.git.orig/src/uk/ac/vamsas/objects/core/Treenode.java
++++ libvamsas-client-java.git/src/uk/ac/vamsas/objects/core/Treenode.java
+@@ -122,27 +122,27 @@ public class Treenode extends uk.ac.vams
if (temp._treeId == null)
return false;
if (this._treeId != temp._treeId) {
@@ -2542,7 +2542,7 @@ Index: libvamsas-client-java-0.2+git2011.10.17+1b42648/src/uk/ac/vamsas/objects/
}
}
} else if (temp._treeId != null)
-@@ -151,29 +151,29 @@
+@@ -151,29 +151,29 @@ public class Treenode extends uk.ac.vams
if (temp._nodespec == null)
return false;
if (this._nodespec != temp._nodespec) {
@@ -2580,7 +2580,7 @@ Index: libvamsas-client-java-0.2+git2011.10.17+1b42648/src/uk/ac/vamsas/objects/
}
}
} else if (temp._nodespec != null)
-@@ -261,14 +261,14 @@
+@@ -261,14 +261,14 @@ public class Treenode extends uk.ac.vams
long tmp;
if (_treeId != null
@@ -2599,11 +2599,11 @@ Index: libvamsas-client-java-0.2+git2011.10.17+1b42648/src/uk/ac/vamsas/objects/
}
return result;
-Index: libvamsas-client-java-0.2+git2011.10.17+1b42648/src/uk/ac/vamsas/test/simpleclient/simpleapp/VamsasDatastore.java
+Index: libvamsas-client-java.git/src/uk/ac/vamsas/test/simpleclient/simpleapp/VamsasDatastore.java
===================================================================
---- libvamsas-client-java-0.2+git2011.10.17+1b42648.orig/src/uk/ac/vamsas/test/simpleclient/simpleapp/VamsasDatastore.java 2011-10-17 23:31:53.000000000 +0200
-+++ libvamsas-client-java-0.2+git2011.10.17+1b42648/src/uk/ac/vamsas/test/simpleclient/simpleapp/VamsasDatastore.java 2011-10-17 23:43:32.608672117 +0200
-@@ -40,7 +40,7 @@
+--- libvamsas-client-java.git.orig/src/uk/ac/vamsas/test/simpleclient/simpleapp/VamsasDatastore.java
++++ libvamsas-client-java.git/src/uk/ac/vamsas/test/simpleclient/simpleapp/VamsasDatastore.java
+@@ -40,7 +40,7 @@ import uk.ac.vamsas.test.simpleclient.Cl
/*
*
* static {
@@ -2612,11 +2612,11 @@ Index: libvamsas-client-java-0.2+git2011.10.17+1b42648/src/uk/ac/vamsas/test/sim
* "org.exolab.castor.serializer", "org.apache.xml.serialize.XMLSerilazizer"); }
*
*/
-Index: libvamsas-client-java-0.2+git2011.10.17+1b42648/src/uk/ac/vamsas/objects/core/Alignment.java
+Index: libvamsas-client-java.git/src/uk/ac/vamsas/objects/core/Alignment.java
===================================================================
---- libvamsas-client-java-0.2+git2011.10.17+1b42648.orig/src/uk/ac/vamsas/objects/core/Alignment.java 2011-10-17 23:31:53.000000000 +0200
-+++ libvamsas-client-java-0.2+git2011.10.17+1b42648/src/uk/ac/vamsas/objects/core/Alignment.java 2011-10-17 23:43:32.628672117 +0200
-@@ -282,27 +282,27 @@
+--- libvamsas-client-java.git.orig/src/uk/ac/vamsas/objects/core/Alignment.java
++++ libvamsas-client-java.git/src/uk/ac/vamsas/objects/core/Alignment.java
+@@ -282,27 +282,27 @@ public class Alignment extends uk.ac.vam
if (temp._gapChar == null)
return false;
if (this._gapChar != temp._gapChar) {
@@ -2652,7 +2652,7 @@ Index: libvamsas-client-java-0.2+git2011.10.17+1b42648/src/uk/ac/vamsas/objects/
}
}
} else if (temp._gapChar != null)
-@@ -315,27 +315,27 @@
+@@ -315,27 +315,27 @@ public class Alignment extends uk.ac.vam
if (temp._id == null)
return false;
if (this._id != temp._id) {
@@ -2688,7 +2688,7 @@ Index: libvamsas-client-java-0.2+git2011.10.17+1b42648/src/uk/ac/vamsas/objects/
}
}
} else if (temp._id != null)
-@@ -344,29 +344,29 @@
+@@ -344,29 +344,29 @@ public class Alignment extends uk.ac.vam
if (temp._modifiable == null)
return false;
if (this._modifiable != temp._modifiable) {
@@ -2726,7 +2726,7 @@ Index: libvamsas-client-java-0.2+git2011.10.17+1b42648/src/uk/ac/vamsas/objects/
}
}
} else if (temp._modifiable != null)
-@@ -375,18 +375,18 @@
+@@ -375,18 +375,18 @@ public class Alignment extends uk.ac.vam
if (temp._alignmentAnnotationList == null)
return false;
if (this._alignmentAnnotationList != temp._alignmentAnnotationList) {
@@ -2749,7 +2749,7 @@ Index: libvamsas-client-java-0.2+git2011.10.17+1b42648/src/uk/ac/vamsas/objects/
.releaseCycleHandle(temp._alignmentAnnotationList);
}
;
-@@ -395,15 +395,15 @@
+@@ -395,15 +395,15 @@ public class Alignment extends uk.ac.vam
if (!thcycle) {
if (!this._alignmentAnnotationList
.equals(temp._alignmentAnnotationList)) {
@@ -2769,7 +2769,7 @@ Index: libvamsas-client-java-0.2+git2011.10.17+1b42648/src/uk/ac/vamsas/objects/
.releaseCycleHandle(temp._alignmentAnnotationList);
}
}
-@@ -413,29 +413,29 @@
+@@ -413,29 +413,29 @@ public class Alignment extends uk.ac.vam
if (temp._treeList == null)
return false;
if (this._treeList != temp._treeList) {
@@ -2807,7 +2807,7 @@ Index: libvamsas-client-java-0.2+git2011.10.17+1b42648/src/uk/ac/vamsas/objects/
}
}
} else if (temp._treeList != null)
-@@ -444,18 +444,18 @@
+@@ -444,18 +444,18 @@ public class Alignment extends uk.ac.vam
if (temp._alignmentSequenceList == null)
return false;
if (this._alignmentSequenceList != temp._alignmentSequenceList) {
@@ -2830,7 +2830,7 @@ Index: libvamsas-client-java-0.2+git2011.10.17+1b42648/src/uk/ac/vamsas/objects/
.releaseCycleHandle(temp._alignmentSequenceList);
}
;
-@@ -464,15 +464,15 @@
+@@ -464,15 +464,15 @@ public class Alignment extends uk.ac.vam
if (!thcycle) {
if (!this._alignmentSequenceList
.equals(temp._alignmentSequenceList)) {
@@ -2850,7 +2850,7 @@ Index: libvamsas-client-java-0.2+git2011.10.17+1b42648/src/uk/ac/vamsas/objects/
.releaseCycleHandle(temp._alignmentSequenceList);
}
}
-@@ -482,18 +482,18 @@
+@@ -482,18 +482,18 @@ public class Alignment extends uk.ac.vam
if (temp._propertyList == null)
return false;
if (this._propertyList != temp._propertyList) {
@@ -2873,7 +2873,7 @@ Index: libvamsas-client-java-0.2+git2011.10.17+1b42648/src/uk/ac/vamsas/objects/
.releaseCycleHandle(temp._propertyList);
}
;
-@@ -501,14 +501,14 @@
+@@ -501,14 +501,14 @@ public class Alignment extends uk.ac.vam
}
if (!thcycle) {
if (!this._propertyList.equals(temp._propertyList)) {
@@ -2892,7 +2892,7 @@ Index: libvamsas-client-java-0.2+git2011.10.17+1b42648/src/uk/ac/vamsas/objects/
}
}
} else if (temp._propertyList != null)
-@@ -517,29 +517,29 @@
+@@ -517,29 +517,29 @@ public class Alignment extends uk.ac.vam
if (temp._provenance == null)
return false;
if (this._provenance != temp._provenance) {
@@ -2930,7 +2930,7 @@ Index: libvamsas-client-java-0.2+git2011.10.17+1b42648/src/uk/ac/vamsas/objects/
}
}
} else if (temp._provenance != null)
-@@ -841,46 +841,46 @@
+@@ -841,46 +841,46 @@ public class Alignment extends uk.ac.vam
long tmp;
if (_gapChar != null
@@ -2993,11 +2993,11 @@ Index: libvamsas-client-java-0.2+git2011.10.17+1b42648/src/uk/ac/vamsas/objects/
}
return result;
-Index: libvamsas-client-java-0.2+git2011.10.17+1b42648/src/uk/ac/vamsas/objects/core/AlignmentSequence.java
+Index: libvamsas-client-java.git/src/uk/ac/vamsas/objects/core/AlignmentSequence.java
===================================================================
---- libvamsas-client-java-0.2+git2011.10.17+1b42648.orig/src/uk/ac/vamsas/objects/core/AlignmentSequence.java 2011-10-17 23:31:53.000000000 +0200
-+++ libvamsas-client-java-0.2+git2011.10.17+1b42648/src/uk/ac/vamsas/objects/core/AlignmentSequence.java 2011-10-17 23:43:32.624672117 +0200
-@@ -132,27 +132,27 @@
+--- libvamsas-client-java.git.orig/src/uk/ac/vamsas/objects/core/AlignmentSequence.java
++++ libvamsas-client-java.git/src/uk/ac/vamsas/objects/core/AlignmentSequence.java
+@@ -132,27 +132,27 @@ public class AlignmentSequence extends u
if (temp._id == null)
return false;
if (this._id != temp._id) {
@@ -3033,7 +3033,7 @@ Index: libvamsas-client-java-0.2+git2011.10.17+1b42648/src/uk/ac/vamsas/objects/
}
}
} else if (temp._id != null)
-@@ -161,27 +161,27 @@
+@@ -161,27 +161,27 @@ public class AlignmentSequence extends u
if (temp._refid == null)
return false;
if (this._refid != temp._refid) {
@@ -3069,7 +3069,7 @@ Index: libvamsas-client-java-0.2+git2011.10.17+1b42648/src/uk/ac/vamsas/objects/
}
}
} else if (temp._refid != null)
-@@ -190,18 +190,18 @@
+@@ -190,18 +190,18 @@ public class AlignmentSequence extends u
if (temp._alignmentSequenceAnnotationList == null)
return false;
if (this._alignmentSequenceAnnotationList != temp._alignmentSequenceAnnotationList) {
@@ -3092,7 +3092,7 @@ Index: libvamsas-client-java-0.2+git2011.10.17+1b42648/src/uk/ac/vamsas/objects/
.releaseCycleHandle(temp._alignmentSequenceAnnotationList);
}
;
-@@ -210,15 +210,15 @@
+@@ -210,15 +210,15 @@ public class AlignmentSequence extends u
if (!thcycle) {
if (!this._alignmentSequenceAnnotationList
.equals(temp._alignmentSequenceAnnotationList)) {
@@ -3112,7 +3112,7 @@ Index: libvamsas-client-java-0.2+git2011.10.17+1b42648/src/uk/ac/vamsas/objects/
.releaseCycleHandle(temp._alignmentSequenceAnnotationList);
}
}
-@@ -323,19 +323,19 @@
+@@ -323,19 +323,19 @@ public class AlignmentSequence extends u
int result = super.hashCode();
long tmp;
@@ -3138,11 +3138,11 @@ Index: libvamsas-client-java-0.2+git2011.10.17+1b42648/src/uk/ac/vamsas/objects/
.releaseCycleHandle(_alignmentSequenceAnnotationList);
}
-Index: libvamsas-client-java-0.2+git2011.10.17+1b42648/src/uk/ac/vamsas/objects/core/AnnotationElement.java
+Index: libvamsas-client-java.git/src/uk/ac/vamsas/objects/core/AnnotationElement.java
===================================================================
---- libvamsas-client-java-0.2+git2011.10.17+1b42648.orig/src/uk/ac/vamsas/objects/core/AnnotationElement.java 2011-10-17 23:31:53.000000000 +0200
-+++ libvamsas-client-java-0.2+git2011.10.17+1b42648/src/uk/ac/vamsas/objects/core/AnnotationElement.java 2011-10-17 23:43:32.632672117 +0200
-@@ -213,27 +213,27 @@
+--- libvamsas-client-java.git.orig/src/uk/ac/vamsas/objects/core/AnnotationElement.java
++++ libvamsas-client-java.git/src/uk/ac/vamsas/objects/core/AnnotationElement.java
+@@ -213,27 +213,27 @@ public class AnnotationElement extends u
if (temp._id == null)
return false;
if (this._id != temp._id) {
@@ -3178,7 +3178,7 @@ Index: libvamsas-client-java-0.2+git2011.10.17+1b42648/src/uk/ac/vamsas/objects/
}
}
} else if (temp._id != null)
-@@ -242,18 +242,18 @@
+@@ -242,18 +242,18 @@ public class AnnotationElement extends u
if (temp._description == null)
return false;
if (this._description != temp._description) {
@@ -3201,7 +3201,7 @@ Index: libvamsas-client-java-0.2+git2011.10.17+1b42648/src/uk/ac/vamsas/objects/
.releaseCycleHandle(temp._description);
}
;
-@@ -261,14 +261,14 @@
+@@ -261,14 +261,14 @@ public class AnnotationElement extends u
}
if (!thcycle) {
if (!this._description.equals(temp._description)) {
@@ -3220,7 +3220,7 @@ Index: libvamsas-client-java-0.2+git2011.10.17+1b42648/src/uk/ac/vamsas/objects/
}
}
} else if (temp._description != null)
-@@ -277,29 +277,29 @@
+@@ -277,29 +277,29 @@ public class AnnotationElement extends u
if (temp._glyphList == null)
return false;
if (this._glyphList != temp._glyphList) {
@@ -3258,7 +3258,7 @@ Index: libvamsas-client-java-0.2+git2011.10.17+1b42648/src/uk/ac/vamsas/objects/
}
}
} else if (temp._glyphList != null)
-@@ -308,29 +308,29 @@
+@@ -308,29 +308,29 @@ public class AnnotationElement extends u
if (temp._valueList == null)
return false;
if (this._valueList != temp._valueList) {
@@ -3296,7 +3296,7 @@ Index: libvamsas-client-java-0.2+git2011.10.17+1b42648/src/uk/ac/vamsas/objects/
}
}
} else if (temp._valueList != null)
-@@ -519,24 +519,24 @@
+@@ -519,24 +519,24 @@ public class AnnotationElement extends u
long tmp;
result = 37 * result + (int) (_position ^ (_position >>> 32));
result = 37 * result + (_after ? 0 : 1);
@@ -3329,11 +3329,11 @@ Index: libvamsas-client-java-0.2+git2011.10.17+1b42648/src/uk/ac/vamsas/objects/
}
return result;
-Index: libvamsas-client-java-0.2+git2011.10.17+1b42648/src/uk/ac/vamsas/objects/core/ApplicationData.java
+Index: libvamsas-client-java.git/src/uk/ac/vamsas/objects/core/ApplicationData.java
===================================================================
---- libvamsas-client-java-0.2+git2011.10.17+1b42648.orig/src/uk/ac/vamsas/objects/core/ApplicationData.java 2011-10-17 23:31:53.000000000 +0200
-+++ libvamsas-client-java-0.2+git2011.10.17+1b42648/src/uk/ac/vamsas/objects/core/ApplicationData.java 2011-10-17 23:43:32.624672117 +0200
-@@ -173,27 +173,27 @@
+--- libvamsas-client-java.git.orig/src/uk/ac/vamsas/objects/core/ApplicationData.java
++++ libvamsas-client-java.git/src/uk/ac/vamsas/objects/core/ApplicationData.java
+@@ -173,27 +173,27 @@ public class ApplicationData extends uk.
if (temp._version == null)
return false;
if (this._version != temp._version) {
@@ -3369,7 +3369,7 @@ Index: libvamsas-client-java-0.2+git2011.10.17+1b42648/src/uk/ac/vamsas/objects/
}
}
} else if (temp._version != null)
-@@ -202,27 +202,27 @@
+@@ -202,27 +202,27 @@ public class ApplicationData extends uk.
if (temp._name == null)
return false;
if (this._name != temp._name) {
@@ -3405,7 +3405,7 @@ Index: libvamsas-client-java-0.2+git2011.10.17+1b42648/src/uk/ac/vamsas/objects/
}
}
} else if (temp._name != null)
-@@ -231,29 +231,29 @@
+@@ -231,29 +231,29 @@ public class ApplicationData extends uk.
if (temp._userList == null)
return false;
if (this._userList != temp._userList) {
@@ -3443,7 +3443,7 @@ Index: libvamsas-client-java-0.2+git2011.10.17+1b42648/src/uk/ac/vamsas/objects/
}
}
} else if (temp._userList != null)
-@@ -262,27 +262,27 @@
+@@ -262,27 +262,27 @@ public class ApplicationData extends uk.
if (temp._common == null)
return false;
if (this._common != temp._common) {
@@ -3479,7 +3479,7 @@ Index: libvamsas-client-java-0.2+git2011.10.17+1b42648/src/uk/ac/vamsas/objects/
}
}
} else if (temp._common != null)
-@@ -291,18 +291,18 @@
+@@ -291,18 +291,18 @@ public class ApplicationData extends uk.
if (temp._instanceList == null)
return false;
if (this._instanceList != temp._instanceList) {
@@ -3502,7 +3502,7 @@ Index: libvamsas-client-java-0.2+git2011.10.17+1b42648/src/uk/ac/vamsas/objects/
.releaseCycleHandle(temp._instanceList);
}
;
-@@ -310,14 +310,14 @@
+@@ -310,14 +310,14 @@ public class ApplicationData extends uk.
}
if (!thcycle) {
if (!this._instanceList.equals(temp._instanceList)) {
@@ -3521,7 +3521,7 @@ Index: libvamsas-client-java-0.2+git2011.10.17+1b42648/src/uk/ac/vamsas/objects/
}
}
} else if (temp._instanceList != null)
-@@ -476,28 +476,28 @@
+@@ -476,28 +476,28 @@ public class ApplicationData extends uk.
long tmp;
if (_version != null
@@ -3560,11 +3560,11 @@ Index: libvamsas-client-java-0.2+git2011.10.17+1b42648/src/uk/ac/vamsas/objects/
}
return result;
-Index: libvamsas-client-java-0.2+git2011.10.17+1b42648/src/uk/ac/vamsas/objects/core/DataSet.java
+Index: libvamsas-client-java.git/src/uk/ac/vamsas/objects/core/DataSet.java
===================================================================
---- libvamsas-client-java-0.2+git2011.10.17+1b42648.orig/src/uk/ac/vamsas/objects/core/DataSet.java 2011-10-17 23:31:53.000000000 +0200
-+++ libvamsas-client-java-0.2+git2011.10.17+1b42648/src/uk/ac/vamsas/objects/core/DataSet.java 2011-10-17 23:43:32.644672117 +0200
-@@ -295,27 +295,27 @@
+--- libvamsas-client-java.git.orig/src/uk/ac/vamsas/objects/core/DataSet.java
++++ libvamsas-client-java.git/src/uk/ac/vamsas/objects/core/DataSet.java
+@@ -295,27 +295,27 @@ public class DataSet extends uk.ac.vamsa
if (temp._id == null)
return false;
if (this._id != temp._id) {
@@ -3600,7 +3600,7 @@ Index: libvamsas-client-java-0.2+git2011.10.17+1b42648/src/uk/ac/vamsas/objects/
}
}
} else if (temp._id != null)
-@@ -324,18 +324,18 @@
+@@ -324,18 +324,18 @@ public class DataSet extends uk.ac.vamsa
if (temp._sequenceList == null)
return false;
if (this._sequenceList != temp._sequenceList) {
@@ -3623,7 +3623,7 @@ Index: libvamsas-client-java-0.2+git2011.10.17+1b42648/src/uk/ac/vamsas/objects/
.releaseCycleHandle(temp._sequenceList);
}
;
-@@ -343,14 +343,14 @@
+@@ -343,14 +343,14 @@ public class DataSet extends uk.ac.vamsa
}
if (!thcycle) {
if (!this._sequenceList.equals(temp._sequenceList)) {
@@ -3642,7 +3642,7 @@ Index: libvamsas-client-java-0.2+git2011.10.17+1b42648/src/uk/ac/vamsas/objects/
}
}
} else if (temp._sequenceList != null)
-@@ -359,18 +359,18 @@
+@@ -359,18 +359,18 @@ public class DataSet extends uk.ac.vamsa
if (temp._sequenceMappingList == null)
return false;
if (this._sequenceMappingList != temp._sequenceMappingList) {
@@ -3665,7 +3665,7 @@ Index: libvamsas-client-java-0.2+git2011.10.17+1b42648/src/uk/ac/vamsas/objects/
.releaseCycleHandle(temp._sequenceMappingList);
}
;
-@@ -378,15 +378,15 @@
+@@ -378,15 +378,15 @@ public class DataSet extends uk.ac.vamsa
}
if (!thcycle) {
if (!this._sequenceMappingList.equals(temp._sequenceMappingList)) {
@@ -3685,7 +3685,7 @@ Index: libvamsas-client-java-0.2+git2011.10.17+1b42648/src/uk/ac/vamsas/objects/
.releaseCycleHandle(temp._sequenceMappingList);
}
}
-@@ -396,18 +396,18 @@
+@@ -396,18 +396,18 @@ public class DataSet extends uk.ac.vamsa
if (temp._dataSetAnnotationsList == null)
return false;
if (this._dataSetAnnotationsList != temp._dataSetAnnotationsList) {
@@ -3708,7 +3708,7 @@ Index: libvamsas-client-java-0.2+git2011.10.17+1b42648/src/uk/ac/vamsas/objects/
.releaseCycleHandle(temp._dataSetAnnotationsList);
}
;
-@@ -416,15 +416,15 @@
+@@ -416,15 +416,15 @@ public class DataSet extends uk.ac.vamsa
if (!thcycle) {
if (!this._dataSetAnnotationsList
.equals(temp._dataSetAnnotationsList)) {
@@ -3728,7 +3728,7 @@ Index: libvamsas-client-java-0.2+git2011.10.17+1b42648/src/uk/ac/vamsas/objects/
.releaseCycleHandle(temp._dataSetAnnotationsList);
}
}
-@@ -434,18 +434,18 @@
+@@ -434,18 +434,18 @@ public class DataSet extends uk.ac.vamsa
if (temp._alignmentList == null)
return false;
if (this._alignmentList != temp._alignmentList) {
@@ -3751,7 +3751,7 @@ Index: libvamsas-client-java-0.2+git2011.10.17+1b42648/src/uk/ac/vamsas/objects/
.releaseCycleHandle(temp._alignmentList);
}
;
-@@ -453,15 +453,15 @@
+@@ -453,15 +453,15 @@ public class DataSet extends uk.ac.vamsa
}
if (!thcycle) {
if (!this._alignmentList.equals(temp._alignmentList)) {
@@ -3771,7 +3771,7 @@ Index: libvamsas-client-java-0.2+git2011.10.17+1b42648/src/uk/ac/vamsas/objects/
.releaseCycleHandle(temp._alignmentList);
}
}
-@@ -471,29 +471,29 @@
+@@ -471,29 +471,29 @@ public class DataSet extends uk.ac.vamsa
if (temp._treeList == null)
return false;
if (this._treeList != temp._treeList) {
@@ -3809,7 +3809,7 @@ Index: libvamsas-client-java-0.2+git2011.10.17+1b42648/src/uk/ac/vamsas/objects/
}
}
} else if (temp._treeList != null)
-@@ -502,29 +502,29 @@
+@@ -502,29 +502,29 @@ public class DataSet extends uk.ac.vamsa
if (temp._provenance == null)
return false;
if (this._provenance != temp._provenance) {
@@ -3847,7 +3847,7 @@ Index: libvamsas-client-java-0.2+git2011.10.17+1b42648/src/uk/ac/vamsas/objects/
}
}
} else if (temp._provenance != null)
-@@ -842,40 +842,40 @@
+@@ -842,40 +842,40 @@ public class DataSet extends uk.ac.vamsa
int result = super.hashCode();
long tmp;
@@ -3902,11 +3902,11 @@ Index: libvamsas-client-java-0.2+git2011.10.17+1b42648/src/uk/ac/vamsas/objects/
}
return result;
-Index: libvamsas-client-java-0.2+git2011.10.17+1b42648/src/uk/ac/vamsas/objects/core/DataSetAnnotations.java
+Index: libvamsas-client-java.git/src/uk/ac/vamsas/objects/core/DataSetAnnotations.java
===================================================================
---- libvamsas-client-java-0.2+git2011.10.17+1b42648.orig/src/uk/ac/vamsas/objects/core/DataSetAnnotations.java 2011-10-17 23:31:53.000000000 +0200
-+++ libvamsas-client-java-0.2+git2011.10.17+1b42648/src/uk/ac/vamsas/objects/core/DataSetAnnotations.java 2011-10-17 23:43:32.640672117 +0200
-@@ -120,27 +120,27 @@
+--- libvamsas-client-java.git.orig/src/uk/ac/vamsas/objects/core/DataSetAnnotations.java
++++ libvamsas-client-java.git/src/uk/ac/vamsas/objects/core/DataSetAnnotations.java
+@@ -120,27 +120,27 @@ public class DataSetAnnotations extends
if (temp._seqRef == null)
return false;
if (this._seqRef != temp._seqRef) {
@@ -3942,7 +3942,7 @@ Index: libvamsas-client-java-0.2+git2011.10.17+1b42648/src/uk/ac/vamsas/objects/
}
}
} else if (temp._seqRef != null)
-@@ -149,29 +149,29 @@
+@@ -149,29 +149,29 @@ public class DataSetAnnotations extends
if (temp._provenance == null)
return false;
if (this._provenance != temp._provenance) {
@@ -3980,7 +3980,7 @@ Index: libvamsas-client-java-0.2+git2011.10.17+1b42648/src/uk/ac/vamsas/objects/
}
}
} else if (temp._provenance != null)
-@@ -255,14 +255,14 @@
+@@ -255,14 +255,14 @@ public class DataSetAnnotations extends
long tmp;
if (_seqRef != null
@@ -3999,11 +3999,11 @@ Index: libvamsas-client-java-0.2+git2011.10.17+1b42648/src/uk/ac/vamsas/objects/
}
return result;
-Index: libvamsas-client-java-0.2+git2011.10.17+1b42648/src/uk/ac/vamsas/objects/core/DbRef.java
+Index: libvamsas-client-java.git/src/uk/ac/vamsas/objects/core/DbRef.java
===================================================================
---- libvamsas-client-java-0.2+git2011.10.17+1b42648.orig/src/uk/ac/vamsas/objects/core/DbRef.java 2011-10-17 23:31:53.000000000 +0200
-+++ libvamsas-client-java-0.2+git2011.10.17+1b42648/src/uk/ac/vamsas/objects/core/DbRef.java 2011-10-17 23:43:32.644672117 +0200
-@@ -231,27 +231,27 @@
+--- libvamsas-client-java.git.orig/src/uk/ac/vamsas/objects/core/DbRef.java
++++ libvamsas-client-java.git/src/uk/ac/vamsas/objects/core/DbRef.java
+@@ -231,27 +231,27 @@ public class DbRef extends uk.ac.vamsas.
if (temp._source == null)
return false;
if (this._source != temp._source) {
@@ -4039,7 +4039,7 @@ Index: libvamsas-client-java-0.2+git2011.10.17+1b42648/src/uk/ac/vamsas/objects/
}
}
} else if (temp._source != null)
-@@ -260,27 +260,27 @@
+@@ -260,27 +260,27 @@ public class DbRef extends uk.ac.vamsas.
if (temp._version == null)
return false;
if (this._version != temp._version) {
@@ -4075,7 +4075,7 @@ Index: libvamsas-client-java-0.2+git2011.10.17+1b42648/src/uk/ac/vamsas/objects/
}
}
} else if (temp._version != null)
-@@ -289,18 +289,18 @@
+@@ -289,18 +289,18 @@ public class DbRef extends uk.ac.vamsas.
if (temp._accessionId == null)
return false;
if (this._accessionId != temp._accessionId) {
@@ -4098,7 +4098,7 @@ Index: libvamsas-client-java-0.2+git2011.10.17+1b42648/src/uk/ac/vamsas/objects/
.releaseCycleHandle(temp._accessionId);
}
;
-@@ -308,14 +308,14 @@
+@@ -308,14 +308,14 @@ public class DbRef extends uk.ac.vamsas.
}
if (!thcycle) {
if (!this._accessionId.equals(temp._accessionId)) {
@@ -4117,7 +4117,7 @@ Index: libvamsas-client-java-0.2+git2011.10.17+1b42648/src/uk/ac/vamsas/objects/
}
}
} else if (temp._accessionId != null)
-@@ -324,27 +324,27 @@
+@@ -324,27 +324,27 @@ public class DbRef extends uk.ac.vamsas.
if (temp._id == null)
return false;
if (this._id != temp._id) {
@@ -4153,7 +4153,7 @@ Index: libvamsas-client-java-0.2+git2011.10.17+1b42648/src/uk/ac/vamsas/objects/
}
}
} else if (temp._id != null)
-@@ -353,27 +353,27 @@
+@@ -353,27 +353,27 @@ public class DbRef extends uk.ac.vamsas.
if (temp._mapList == null)
return false;
if (this._mapList != temp._mapList) {
@@ -4189,7 +4189,7 @@ Index: libvamsas-client-java-0.2+git2011.10.17+1b42648/src/uk/ac/vamsas/objects/
}
}
} else if (temp._mapList != null)
-@@ -382,29 +382,29 @@
+@@ -382,29 +382,29 @@ public class DbRef extends uk.ac.vamsas.
if (temp._linkList == null)
return false;
if (this._linkList != temp._linkList) {
@@ -4227,7 +4227,7 @@ Index: libvamsas-client-java-0.2+git2011.10.17+1b42648/src/uk/ac/vamsas/objects/
}
}
} else if (temp._linkList != null)
-@@ -413,18 +413,18 @@
+@@ -413,18 +413,18 @@ public class DbRef extends uk.ac.vamsas.
if (temp._propertyList == null)
return false;
if (this._propertyList != temp._propertyList) {
@@ -4250,7 +4250,7 @@ Index: libvamsas-client-java-0.2+git2011.10.17+1b42648/src/uk/ac/vamsas/objects/
.releaseCycleHandle(temp._propertyList);
}
;
-@@ -432,14 +432,14 @@
+@@ -432,14 +432,14 @@ public class DbRef extends uk.ac.vamsas.
}
if (!thcycle) {
if (!this._propertyList.equals(temp._propertyList)) {
@@ -4269,7 +4269,7 @@ Index: libvamsas-client-java-0.2+git2011.10.17+1b42648/src/uk/ac/vamsas/objects/
}
}
} else if (temp._propertyList != null)
-@@ -666,38 +666,38 @@
+@@ -666,38 +666,38 @@ public class DbRef extends uk.ac.vamsas.
long tmp;
if (_source != null
@@ -4322,11 +4322,11 @@ Index: libvamsas-client-java-0.2+git2011.10.17+1b42648/src/uk/ac/vamsas/objects/
}
return result;
-Index: libvamsas-client-java-0.2+git2011.10.17+1b42648/src/uk/ac/vamsas/objects/core/Entry.java
+Index: libvamsas-client-java.git/src/uk/ac/vamsas/objects/core/Entry.java
===================================================================
---- libvamsas-client-java-0.2+git2011.10.17+1b42648.orig/src/uk/ac/vamsas/objects/core/Entry.java 2011-10-17 23:31:53.000000000 +0200
-+++ libvamsas-client-java-0.2+git2011.10.17+1b42648/src/uk/ac/vamsas/objects/core/Entry.java 2011-10-17 23:43:32.640672117 +0200
-@@ -225,27 +225,27 @@
+--- libvamsas-client-java.git.orig/src/uk/ac/vamsas/objects/core/Entry.java
++++ libvamsas-client-java.git/src/uk/ac/vamsas/objects/core/Entry.java
+@@ -225,27 +225,27 @@ public class Entry extends uk.ac.vamsas.
if (temp._id == null)
return false;
if (this._id != temp._id) {
@@ -4362,7 +4362,7 @@ Index: libvamsas-client-java-0.2+git2011.10.17+1b42648/src/uk/ac/vamsas/objects/
}
}
} else if (temp._id != null)
-@@ -254,27 +254,27 @@
+@@ -254,27 +254,27 @@ public class Entry extends uk.ac.vamsas.
if (temp._user == null)
return false;
if (this._user != temp._user) {
@@ -4398,7 +4398,7 @@ Index: libvamsas-client-java-0.2+git2011.10.17+1b42648/src/uk/ac/vamsas/objects/
}
}
} else if (temp._user != null)
-@@ -283,27 +283,27 @@
+@@ -283,27 +283,27 @@ public class Entry extends uk.ac.vamsas.
if (temp._app == null)
return false;
if (this._app != temp._app) {
@@ -4434,7 +4434,7 @@ Index: libvamsas-client-java-0.2+git2011.10.17+1b42648/src/uk/ac/vamsas/objects/
}
}
} else if (temp._app != null)
-@@ -312,27 +312,27 @@
+@@ -312,27 +312,27 @@ public class Entry extends uk.ac.vamsas.
if (temp._action == null)
return false;
if (this._action != temp._action) {
@@ -4470,7 +4470,7 @@ Index: libvamsas-client-java-0.2+git2011.10.17+1b42648/src/uk/ac/vamsas/objects/
}
}
} else if (temp._action != null)
-@@ -341,27 +341,27 @@
+@@ -341,27 +341,27 @@ public class Entry extends uk.ac.vamsas.
if (temp._date == null)
return false;
if (this._date != temp._date) {
@@ -4506,7 +4506,7 @@ Index: libvamsas-client-java-0.2+git2011.10.17+1b42648/src/uk/ac/vamsas/objects/
}
}
} else if (temp._date != null)
-@@ -370,18 +370,18 @@
+@@ -370,18 +370,18 @@ public class Entry extends uk.ac.vamsas.
if (temp._propertyList == null)
return false;
if (this._propertyList != temp._propertyList) {
@@ -4529,7 +4529,7 @@ Index: libvamsas-client-java-0.2+git2011.10.17+1b42648/src/uk/ac/vamsas/objects/
.releaseCycleHandle(temp._propertyList);
}
;
-@@ -389,14 +389,14 @@
+@@ -389,14 +389,14 @@ public class Entry extends uk.ac.vamsas.
}
if (!thcycle) {
if (!this._propertyList.equals(temp._propertyList)) {
@@ -4548,7 +4548,7 @@ Index: libvamsas-client-java-0.2+git2011.10.17+1b42648/src/uk/ac/vamsas/objects/
}
}
} else if (temp._propertyList != null)
-@@ -405,29 +405,29 @@
+@@ -405,29 +405,29 @@ public class Entry extends uk.ac.vamsas.
if (temp._paramList == null)
return false;
if (this._paramList != temp._paramList) {
@@ -4586,7 +4586,7 @@ Index: libvamsas-client-java-0.2+git2011.10.17+1b42648/src/uk/ac/vamsas/objects/
}
}
} else if (temp._paramList != null)
-@@ -436,29 +436,29 @@
+@@ -436,29 +436,29 @@ public class Entry extends uk.ac.vamsas.
if (temp._inputList == null)
return false;
if (this._inputList != temp._inputList) {
@@ -4624,7 +4624,7 @@ Index: libvamsas-client-java-0.2+git2011.10.17+1b42648/src/uk/ac/vamsas/objects/
}
}
} else if (temp._inputList != null)
-@@ -689,41 +689,41 @@
+@@ -689,41 +689,41 @@ public class Entry extends uk.ac.vamsas.
int result = super.hashCode();
long tmp;
@@ -4682,11 +4682,11 @@ Index: libvamsas-client-java-0.2+git2011.10.17+1b42648/src/uk/ac/vamsas/objects/
}
return result;
-Index: libvamsas-client-java-0.2+git2011.10.17+1b42648/src/uk/ac/vamsas/objects/core/LockFile.java
+Index: libvamsas-client-java.git/src/uk/ac/vamsas/objects/core/LockFile.java
===================================================================
---- libvamsas-client-java-0.2+git2011.10.17+1b42648.orig/src/uk/ac/vamsas/objects/core/LockFile.java 2011-10-17 23:31:53.000000000 +0200
-+++ libvamsas-client-java-0.2+git2011.10.17+1b42648/src/uk/ac/vamsas/objects/core/LockFile.java 2011-10-17 23:43:32.624672117 +0200
-@@ -81,27 +81,27 @@
+--- libvamsas-client-java.git.orig/src/uk/ac/vamsas/objects/core/LockFile.java
++++ libvamsas-client-java.git/src/uk/ac/vamsas/objects/core/LockFile.java
+@@ -81,27 +81,27 @@ public class LockFile extends uk.ac.vams
if (temp._content == null)
return false;
if (this._content != temp._content) {
@@ -4722,7 +4722,7 @@ Index: libvamsas-client-java-0.2+git2011.10.17+1b42648/src/uk/ac/vamsas/objects/
}
}
} else if (temp._content != null)
-@@ -134,9 +134,9 @@
+@@ -134,9 +134,9 @@ public class LockFile extends uk.ac.vams
long tmp;
if (_content != null
@@ -4734,11 +4734,11 @@ Index: libvamsas-client-java-0.2+git2011.10.17+1b42648/src/uk/ac/vamsas/objects/
}
return result;
-Index: libvamsas-client-java-0.2+git2011.10.17+1b42648/src/uk/ac/vamsas/objects/core/Newick.java
+Index: libvamsas-client-java.git/src/uk/ac/vamsas/objects/core/Newick.java
===================================================================
---- libvamsas-client-java-0.2+git2011.10.17+1b42648.orig/src/uk/ac/vamsas/objects/core/Newick.java 2011-10-17 23:31:53.000000000 +0200
-+++ libvamsas-client-java-0.2+git2011.10.17+1b42648/src/uk/ac/vamsas/objects/core/Newick.java 2011-10-17 23:43:32.628672117 +0200
-@@ -97,27 +97,27 @@
+--- libvamsas-client-java.git.orig/src/uk/ac/vamsas/objects/core/Newick.java
++++ libvamsas-client-java.git/src/uk/ac/vamsas/objects/core/Newick.java
+@@ -97,27 +97,27 @@ public class Newick extends uk.ac.vamsas
if (temp._content == null)
return false;
if (this._content != temp._content) {
@@ -4774,7 +4774,7 @@ Index: libvamsas-client-java-0.2+git2011.10.17+1b42648/src/uk/ac/vamsas/objects/
}
}
} else if (temp._content != null)
-@@ -126,27 +126,27 @@
+@@ -126,27 +126,27 @@ public class Newick extends uk.ac.vamsas
if (temp._title == null)
return false;
if (this._title != temp._title) {
@@ -4810,7 +4810,7 @@ Index: libvamsas-client-java-0.2+git2011.10.17+1b42648/src/uk/ac/vamsas/objects/
}
}
} else if (temp._title != null)
-@@ -155,27 +155,27 @@
+@@ -155,27 +155,27 @@ public class Newick extends uk.ac.vamsas
if (temp._id == null)
return false;
if (this._id != temp._id) {
@@ -4846,7 +4846,7 @@ Index: libvamsas-client-java-0.2+git2011.10.17+1b42648/src/uk/ac/vamsas/objects/
}
}
} else if (temp._id != null)
-@@ -184,29 +184,29 @@
+@@ -184,29 +184,29 @@ public class Newick extends uk.ac.vamsas
if (temp._modifiable == null)
return false;
if (this._modifiable != temp._modifiable) {
@@ -4884,7 +4884,7 @@ Index: libvamsas-client-java-0.2+git2011.10.17+1b42648/src/uk/ac/vamsas/objects/
}
}
} else if (temp._modifiable != null)
-@@ -268,22 +268,22 @@
+@@ -268,22 +268,22 @@ public class Newick extends uk.ac.vamsas
long tmp;
if (_content != null
@@ -4915,11 +4915,11 @@ Index: libvamsas-client-java-0.2+git2011.10.17+1b42648/src/uk/ac/vamsas/objects/
}
return result;
-Index: libvamsas-client-java-0.2+git2011.10.17+1b42648/src/uk/ac/vamsas/objects/core/Provenance.java
+Index: libvamsas-client-java.git/src/uk/ac/vamsas/objects/core/Provenance.java
===================================================================
---- libvamsas-client-java-0.2+git2011.10.17+1b42648.orig/src/uk/ac/vamsas/objects/core/Provenance.java 2011-10-17 23:31:53.000000000 +0200
-+++ libvamsas-client-java-0.2+git2011.10.17+1b42648/src/uk/ac/vamsas/objects/core/Provenance.java 2011-10-17 23:43:32.640672117 +0200
-@@ -116,29 +116,29 @@
+--- libvamsas-client-java.git.orig/src/uk/ac/vamsas/objects/core/Provenance.java
++++ libvamsas-client-java.git/src/uk/ac/vamsas/objects/core/Provenance.java
+@@ -116,29 +116,29 @@ public class Provenance extends uk.ac.va
if (temp._entryList == null)
return false;
if (this._entryList != temp._entryList) {
@@ -4957,7 +4957,7 @@ Index: libvamsas-client-java-0.2+git2011.10.17+1b42648/src/uk/ac/vamsas/objects/
}
}
} else if (temp._entryList != null)
-@@ -213,9 +213,9 @@
+@@ -213,9 +213,9 @@ public class Provenance extends uk.ac.va
long tmp;
if (_entryList != null
@@ -4969,11 +4969,11 @@ Index: libvamsas-client-java-0.2+git2011.10.17+1b42648/src/uk/ac/vamsas/objects/
}
return result;
-Index: libvamsas-client-java-0.2+git2011.10.17+1b42648/src/uk/ac/vamsas/objects/core/Sequence.java
+Index: libvamsas-client-java.git/src/uk/ac/vamsas/objects/core/Sequence.java
===================================================================
---- libvamsas-client-java-0.2+git2011.10.17+1b42648.orig/src/uk/ac/vamsas/objects/core/Sequence.java 2011-10-17 23:31:53.000000000 +0200
-+++ libvamsas-client-java-0.2+git2011.10.17+1b42648/src/uk/ac/vamsas/objects/core/Sequence.java 2011-10-17 23:43:32.640672117 +0200
-@@ -170,27 +170,27 @@
+--- libvamsas-client-java.git.orig/src/uk/ac/vamsas/objects/core/Sequence.java
++++ libvamsas-client-java.git/src/uk/ac/vamsas/objects/core/Sequence.java
+@@ -170,27 +170,27 @@ public class Sequence extends uk.ac.vams
if (temp._id == null)
return false;
if (this._id != temp._id) {
@@ -5009,7 +5009,7 @@ Index: libvamsas-client-java-0.2+git2011.10.17+1b42648/src/uk/ac/vamsas/objects/
}
}
} else if (temp._id != null)
-@@ -199,29 +199,29 @@
+@@ -199,29 +199,29 @@ public class Sequence extends uk.ac.vams
if (temp._dictionary == null)
return false;
if (this._dictionary != temp._dictionary) {
@@ -5047,7 +5047,7 @@ Index: libvamsas-client-java-0.2+git2011.10.17+1b42648/src/uk/ac/vamsas/objects/
}
}
} else if (temp._dictionary != null)
-@@ -230,29 +230,29 @@
+@@ -230,29 +230,29 @@ public class Sequence extends uk.ac.vams
if (temp._dbRefList == null)
return false;
if (this._dbRefList != temp._dbRefList) {
@@ -5085,7 +5085,7 @@ Index: libvamsas-client-java-0.2+git2011.10.17+1b42648/src/uk/ac/vamsas/objects/
}
}
} else if (temp._dbRefList != null)
-@@ -261,29 +261,29 @@
+@@ -261,29 +261,29 @@ public class Sequence extends uk.ac.vams
if (temp._vxrefList == null)
return false;
if (this._vxrefList != temp._vxrefList) {
@@ -5123,7 +5123,7 @@ Index: libvamsas-client-java-0.2+git2011.10.17+1b42648/src/uk/ac/vamsas/objects/
}
}
} else if (temp._vxrefList != null)
-@@ -431,24 +431,24 @@
+@@ -431,24 +431,24 @@ public class Sequence extends uk.ac.vams
int result = super.hashCode();
long tmp;
@@ -5156,11 +5156,11 @@ Index: libvamsas-client-java-0.2+git2011.10.17+1b42648/src/uk/ac/vamsas/objects/
}
return result;
-Index: libvamsas-client-java-0.2+git2011.10.17+1b42648/src/uk/ac/vamsas/objects/core/SequenceType.java
+Index: libvamsas-client-java.git/src/uk/ac/vamsas/objects/core/SequenceType.java
===================================================================
---- libvamsas-client-java-0.2+git2011.10.17+1b42648.orig/src/uk/ac/vamsas/objects/core/SequenceType.java 2011-10-17 23:31:53.000000000 +0200
-+++ libvamsas-client-java-0.2+git2011.10.17+1b42648/src/uk/ac/vamsas/objects/core/SequenceType.java 2011-10-17 23:43:32.624672117 +0200
-@@ -171,29 +171,29 @@
+--- libvamsas-client-java.git.orig/src/uk/ac/vamsas/objects/core/SequenceType.java
++++ libvamsas-client-java.git/src/uk/ac/vamsas/objects/core/SequenceType.java
+@@ -171,29 +171,29 @@ public class SequenceType extends uk.ac.
if (temp._sequence == null)
return false;
if (this._sequence != temp._sequence) {
@@ -5198,7 +5198,7 @@ Index: libvamsas-client-java-0.2+git2011.10.17+1b42648/src/uk/ac/vamsas/objects/
}
}
} else if (temp._sequence != null)
-@@ -202,27 +202,27 @@
+@@ -202,27 +202,27 @@ public class SequenceType extends uk.ac.
if (temp._name == null)
return false;
if (this._name != temp._name) {
@@ -5234,7 +5234,7 @@ Index: libvamsas-client-java-0.2+git2011.10.17+1b42648/src/uk/ac/vamsas/objects/
}
}
} else if (temp._name != null)
-@@ -231,18 +231,18 @@
+@@ -231,18 +231,18 @@ public class SequenceType extends uk.ac.
if (temp._description == null)
return false;
if (this._description != temp._description) {
@@ -5257,7 +5257,7 @@ Index: libvamsas-client-java-0.2+git2011.10.17+1b42648/src/uk/ac/vamsas/objects/
.releaseCycleHandle(temp._description);
}
;
-@@ -250,14 +250,14 @@
+@@ -250,14 +250,14 @@ public class SequenceType extends uk.ac.
}
if (!thcycle) {
if (!this._description.equals(temp._description)) {
@@ -5276,7 +5276,7 @@ Index: libvamsas-client-java-0.2+git2011.10.17+1b42648/src/uk/ac/vamsas/objects/
}
}
} else if (temp._description != null)
-@@ -266,18 +266,18 @@
+@@ -266,18 +266,18 @@ public class SequenceType extends uk.ac.
if (temp._propertyList == null)
return false;
if (this._propertyList != temp._propertyList) {
@@ -5299,7 +5299,7 @@ Index: libvamsas-client-java-0.2+git2011.10.17+1b42648/src/uk/ac/vamsas/objects/
.releaseCycleHandle(temp._propertyList);
}
;
-@@ -285,14 +285,14 @@
+@@ -285,14 +285,14 @@ public class SequenceType extends uk.ac.
}
if (!thcycle) {
if (!this._propertyList.equals(temp._propertyList)) {
@@ -5318,7 +5318,7 @@ Index: libvamsas-client-java-0.2+git2011.10.17+1b42648/src/uk/ac/vamsas/objects/
}
}
} else if (temp._propertyList != null)
-@@ -434,23 +434,23 @@
+@@ -434,23 +434,23 @@ public class SequenceType extends uk.ac.
result = 37 * result + (int) (_start ^ (_start >>> 32));
result = 37 * result + (int) (_end ^ (_end >>> 32));
if (_sequence != null
@@ -5350,11 +5350,11 @@ Index: libvamsas-client-java-0.2+git2011.10.17+1b42648/src/uk/ac/vamsas/objects/
}
return result;
-Index: libvamsas-client-java-0.2+git2011.10.17+1b42648/src/uk/ac/vamsas/objects/core/Tree.java
+Index: libvamsas-client-java.git/src/uk/ac/vamsas/objects/core/Tree.java
===================================================================
---- libvamsas-client-java-0.2+git2011.10.17+1b42648.orig/src/uk/ac/vamsas/objects/core/Tree.java 2011-10-17 23:31:53.000000000 +0200
-+++ libvamsas-client-java-0.2+git2011.10.17+1b42648/src/uk/ac/vamsas/objects/core/Tree.java 2011-10-17 23:43:32.624672117 +0200
-@@ -219,27 +219,27 @@
+--- libvamsas-client-java.git.orig/src/uk/ac/vamsas/objects/core/Tree.java
++++ libvamsas-client-java.git/src/uk/ac/vamsas/objects/core/Tree.java
+@@ -219,27 +219,27 @@ public class Tree extends uk.ac.vamsas.c
if (temp._id == null)
return false;
if (this._id != temp._id) {
@@ -5390,7 +5390,7 @@ Index: libvamsas-client-java-0.2+git2011.10.17+1b42648/src/uk/ac/vamsas/objects/
}
}
} else if (temp._id != null)
-@@ -248,29 +248,29 @@
+@@ -248,29 +248,29 @@ public class Tree extends uk.ac.vamsas.c
if (temp._modifiable == null)
return false;
if (this._modifiable != temp._modifiable) {
@@ -5428,7 +5428,7 @@ Index: libvamsas-client-java-0.2+git2011.10.17+1b42648/src/uk/ac/vamsas/objects/
}
}
} else if (temp._modifiable != null)
-@@ -279,27 +279,27 @@
+@@ -279,27 +279,27 @@ public class Tree extends uk.ac.vamsas.c
if (temp._title == null)
return false;
if (this._title != temp._title) {
@@ -5464,7 +5464,7 @@ Index: libvamsas-client-java-0.2+git2011.10.17+1b42648/src/uk/ac/vamsas/objects/
}
}
} else if (temp._title != null)
-@@ -308,29 +308,29 @@
+@@ -308,29 +308,29 @@ public class Tree extends uk.ac.vamsas.c
if (temp._newickList == null)
return false;
if (this._newickList != temp._newickList) {
@@ -5502,7 +5502,7 @@ Index: libvamsas-client-java-0.2+git2011.10.17+1b42648/src/uk/ac/vamsas/objects/
}
}
} else if (temp._newickList != null)
-@@ -339,18 +339,18 @@
+@@ -339,18 +339,18 @@ public class Tree extends uk.ac.vamsas.c
if (temp._treenodeList == null)
return false;
if (this._treenodeList != temp._treenodeList) {
@@ -5525,7 +5525,7 @@ Index: libvamsas-client-java-0.2+git2011.10.17+1b42648/src/uk/ac/vamsas/objects/
.releaseCycleHandle(temp._treenodeList);
}
;
-@@ -358,14 +358,14 @@
+@@ -358,14 +358,14 @@ public class Tree extends uk.ac.vamsas.c
}
if (!thcycle) {
if (!this._treenodeList.equals(temp._treenodeList)) {
@@ -5544,7 +5544,7 @@ Index: libvamsas-client-java-0.2+git2011.10.17+1b42648/src/uk/ac/vamsas/objects/
}
}
} else if (temp._treenodeList != null)
-@@ -374,18 +374,18 @@
+@@ -374,18 +374,18 @@ public class Tree extends uk.ac.vamsas.c
if (temp._propertyList == null)
return false;
if (this._propertyList != temp._propertyList) {
@@ -5567,7 +5567,7 @@ Index: libvamsas-client-java-0.2+git2011.10.17+1b42648/src/uk/ac/vamsas/objects/
.releaseCycleHandle(temp._propertyList);
}
;
-@@ -393,14 +393,14 @@
+@@ -393,14 +393,14 @@ public class Tree extends uk.ac.vamsas.c
}
if (!thcycle) {
if (!this._propertyList.equals(temp._propertyList)) {
@@ -5586,7 +5586,7 @@ Index: libvamsas-client-java-0.2+git2011.10.17+1b42648/src/uk/ac/vamsas/objects/
}
}
} else if (temp._propertyList != null)
-@@ -409,29 +409,29 @@
+@@ -409,29 +409,29 @@ public class Tree extends uk.ac.vamsas.c
if (temp._provenance == null)
return false;
if (this._provenance != temp._provenance) {
@@ -5624,7 +5624,7 @@ Index: libvamsas-client-java-0.2+git2011.10.17+1b42648/src/uk/ac/vamsas/objects/
}
}
} else if (temp._provenance != null)
-@@ -651,38 +651,38 @@
+@@ -651,38 +651,38 @@ public class Tree extends uk.ac.vamsas.c
int result = super.hashCode();
long tmp;
@@ -5677,11 +5677,11 @@ Index: libvamsas-client-java-0.2+git2011.10.17+1b42648/src/uk/ac/vamsas/objects/
}
return result;
-Index: libvamsas-client-java-0.2+git2011.10.17+1b42648/src/uk/ac/vamsas/objects/core/User.java
+Index: libvamsas-client-java.git/src/uk/ac/vamsas/objects/core/User.java
===================================================================
---- libvamsas-client-java-0.2+git2011.10.17+1b42648.orig/src/uk/ac/vamsas/objects/core/User.java 2011-10-17 23:31:53.000000000 +0200
-+++ libvamsas-client-java-0.2+git2011.10.17+1b42648/src/uk/ac/vamsas/objects/core/User.java 2011-10-17 23:43:32.640672117 +0200
-@@ -85,29 +85,29 @@
+--- libvamsas-client-java.git.orig/src/uk/ac/vamsas/objects/core/User.java
++++ libvamsas-client-java.git/src/uk/ac/vamsas/objects/core/User.java
+@@ -85,29 +85,29 @@ public class User extends uk.ac.vamsas.o
if (temp._fullname == null)
return false;
if (this._fullname != temp._fullname) {
@@ -5719,7 +5719,7 @@ Index: libvamsas-client-java-0.2+git2011.10.17+1b42648/src/uk/ac/vamsas/objects/
}
}
} else if (temp._fullname != null)
-@@ -116,18 +116,18 @@
+@@ -116,18 +116,18 @@ public class User extends uk.ac.vamsas.o
if (temp._organization == null)
return false;
if (this._organization != temp._organization) {
@@ -5742,7 +5742,7 @@ Index: libvamsas-client-java-0.2+git2011.10.17+1b42648/src/uk/ac/vamsas/objects/
.releaseCycleHandle(temp._organization);
}
;
-@@ -135,14 +135,14 @@
+@@ -135,14 +135,14 @@ public class User extends uk.ac.vamsas.o
}
if (!thcycle) {
if (!this._organization.equals(temp._organization)) {
@@ -5761,7 +5761,7 @@ Index: libvamsas-client-java-0.2+git2011.10.17+1b42648/src/uk/ac/vamsas/objects/
}
}
} else if (temp._organization != null)
-@@ -183,14 +183,14 @@
+@@ -183,14 +183,14 @@ public class User extends uk.ac.vamsas.o
long tmp;
if (_fullname != null
@@ -5780,11 +5780,11 @@ Index: libvamsas-client-java-0.2+git2011.10.17+1b42648/src/uk/ac/vamsas/objects/
}
return result;
-Index: libvamsas-client-java-0.2+git2011.10.17+1b42648/src/uk/ac/vamsas/objects/core/VAMSAS.java
+Index: libvamsas-client-java.git/src/uk/ac/vamsas/objects/core/VAMSAS.java
===================================================================
---- libvamsas-client-java-0.2+git2011.10.17+1b42648.orig/src/uk/ac/vamsas/objects/core/VAMSAS.java 2011-10-17 23:31:53.000000000 +0200
-+++ libvamsas-client-java-0.2+git2011.10.17+1b42648/src/uk/ac/vamsas/objects/core/VAMSAS.java 2011-10-17 23:43:32.624672117 +0200
-@@ -168,27 +168,27 @@
+--- libvamsas-client-java.git.orig/src/uk/ac/vamsas/objects/core/VAMSAS.java
++++ libvamsas-client-java.git/src/uk/ac/vamsas/objects/core/VAMSAS.java
+@@ -168,27 +168,27 @@ public class VAMSAS extends uk.ac.vamsas
if (temp._id == null)
return false;
if (this._id != temp._id) {
@@ -5820,7 +5820,7 @@ Index: libvamsas-client-java-0.2+git2011.10.17+1b42648/src/uk/ac/vamsas/objects/
}
}
} else if (temp._id != null)
-@@ -197,29 +197,29 @@
+@@ -197,29 +197,29 @@ public class VAMSAS extends uk.ac.vamsas
if (temp._modifiable == null)
return false;
if (this._modifiable != temp._modifiable) {
@@ -5858,7 +5858,7 @@ Index: libvamsas-client-java-0.2+git2011.10.17+1b42648/src/uk/ac/vamsas/objects/
}
}
} else if (temp._modifiable != null)
-@@ -228,29 +228,29 @@
+@@ -228,29 +228,29 @@ public class VAMSAS extends uk.ac.vamsas
if (temp._treeList == null)
return false;
if (this._treeList != temp._treeList) {
@@ -5896,7 +5896,7 @@ Index: libvamsas-client-java-0.2+git2011.10.17+1b42648/src/uk/ac/vamsas/objects/
}
}
} else if (temp._treeList != null)
-@@ -259,18 +259,18 @@
+@@ -259,18 +259,18 @@ public class VAMSAS extends uk.ac.vamsas
if (temp._dataSetList == null)
return false;
if (this._dataSetList != temp._dataSetList) {
@@ -5919,7 +5919,7 @@ Index: libvamsas-client-java-0.2+git2011.10.17+1b42648/src/uk/ac/vamsas/objects/
.releaseCycleHandle(temp._dataSetList);
}
;
-@@ -278,14 +278,14 @@
+@@ -278,14 +278,14 @@ public class VAMSAS extends uk.ac.vamsas
}
if (!thcycle) {
if (!this._dataSetList.equals(temp._dataSetList)) {
@@ -5938,7 +5938,7 @@ Index: libvamsas-client-java-0.2+git2011.10.17+1b42648/src/uk/ac/vamsas/objects/
}
}
} else if (temp._dataSetList != null)
-@@ -432,24 +432,24 @@
+@@ -432,24 +432,24 @@ public class VAMSAS extends uk.ac.vamsas
int result = super.hashCode();
long tmp;
@@ -5971,11 +5971,11 @@ Index: libvamsas-client-java-0.2+git2011.10.17+1b42648/src/uk/ac/vamsas/objects/
}
return result;
-Index: libvamsas-client-java-0.2+git2011.10.17+1b42648/src/uk/ac/vamsas/objects/core/VamsasDocument.java
+Index: libvamsas-client-java.git/src/uk/ac/vamsas/objects/core/VamsasDocument.java
===================================================================
---- libvamsas-client-java-0.2+git2011.10.17+1b42648.orig/src/uk/ac/vamsas/objects/core/VamsasDocument.java 2011-10-17 23:31:53.000000000 +0200
-+++ libvamsas-client-java-0.2+git2011.10.17+1b42648/src/uk/ac/vamsas/objects/core/VamsasDocument.java 2011-10-17 23:43:32.644672117 +0200
-@@ -218,27 +218,27 @@
+--- libvamsas-client-java.git.orig/src/uk/ac/vamsas/objects/core/VamsasDocument.java
++++ libvamsas-client-java.git/src/uk/ac/vamsas/objects/core/VamsasDocument.java
+@@ -218,27 +218,27 @@ public class VamsasDocument extends uk.a
if (temp._version == null)
return false;
if (this._version != temp._version) {
@@ -6011,7 +6011,7 @@ Index: libvamsas-client-java-0.2+git2011.10.17+1b42648/src/uk/ac/vamsas/objects/
}
}
} else if (temp._version != null)
-@@ -247,29 +247,29 @@
+@@ -247,29 +247,29 @@ public class VamsasDocument extends uk.a
if (temp._lockFile == null)
return false;
if (this._lockFile != temp._lockFile) {
@@ -6049,7 +6049,7 @@ Index: libvamsas-client-java-0.2+git2011.10.17+1b42648/src/uk/ac/vamsas/objects/
}
}
} else if (temp._lockFile != null)
-@@ -278,29 +278,29 @@
+@@ -278,29 +278,29 @@ public class VamsasDocument extends uk.a
if (temp._provenance == null)
return false;
if (this._provenance != temp._provenance) {
@@ -6087,7 +6087,7 @@ Index: libvamsas-client-java-0.2+git2011.10.17+1b42648/src/uk/ac/vamsas/objects/
}
}
} else if (temp._provenance != null)
-@@ -309,29 +309,29 @@
+@@ -309,29 +309,29 @@ public class VamsasDocument extends uk.a
if (temp._VAMSASList == null)
return false;
if (this._VAMSASList != temp._VAMSASList) {
@@ -6125,7 +6125,7 @@ Index: libvamsas-client-java-0.2+git2011.10.17+1b42648/src/uk/ac/vamsas/objects/
}
}
} else if (temp._VAMSASList != null)
-@@ -340,18 +340,18 @@
+@@ -340,18 +340,18 @@ public class VamsasDocument extends uk.a
if (temp._applicationDataList == null)
return false;
if (this._applicationDataList != temp._applicationDataList) {
@@ -6148,7 +6148,7 @@ Index: libvamsas-client-java-0.2+git2011.10.17+1b42648/src/uk/ac/vamsas/objects/
.releaseCycleHandle(temp._applicationDataList);
}
;
-@@ -359,15 +359,15 @@
+@@ -359,15 +359,15 @@ public class VamsasDocument extends uk.a
}
if (!thcycle) {
if (!this._applicationDataList.equals(temp._applicationDataList)) {
@@ -6168,7 +6168,7 @@ Index: libvamsas-client-java-0.2+git2011.10.17+1b42648/src/uk/ac/vamsas/objects/
.releaseCycleHandle(temp._applicationDataList);
}
}
-@@ -377,18 +377,18 @@
+@@ -377,18 +377,18 @@ public class VamsasDocument extends uk.a
if (temp._attachmentList == null)
return false;
if (this._attachmentList != temp._attachmentList) {
@@ -6191,7 +6191,7 @@ Index: libvamsas-client-java-0.2+git2011.10.17+1b42648/src/uk/ac/vamsas/objects/
.releaseCycleHandle(temp._attachmentList);
}
;
-@@ -396,15 +396,15 @@
+@@ -396,15 +396,15 @@ public class VamsasDocument extends uk.a
}
if (!thcycle) {
if (!this._attachmentList.equals(temp._attachmentList)) {
@@ -6211,7 +6211,7 @@ Index: libvamsas-client-java-0.2+git2011.10.17+1b42648/src/uk/ac/vamsas/objects/
.releaseCycleHandle(temp._attachmentList);
}
}
-@@ -622,34 +622,34 @@
+@@ -622,34 +622,34 @@ public class VamsasDocument extends uk.a
long tmp;
if (_version != null
Debdiff
[The following lists of changes regard files as different if they have different names, permissions or owners.]
Files in second set of .debs but not in first
-rw-r--r-- root/root /usr/share/java/vamsas-client-0.2+git20100219.2.1b42648.jar lrwxrwxrwx root/root /usr/share/java/vamsas-client.jar -> vamsas-client-0.2+git20100219.2.1b42648.jar
Files in first set of .debs but not in second
-rw-r--r-- root/root /usr/share/java/vamsas-client-0.2.jar lrwxrwxrwx root/root /usr/share/java/vamsas-client.jar -> vamsas-client-0.2.jar
No differences were encountered in the control files