Author: mcaisse
Date: Thu Mar 31 20:42:49 2005
New Revision: 159662
URL: http://svn.apache.org/viewcvs?view=rev&rev=159662
Log:
Fixed Oid classes as per spec
Modified:
incubator/jdo/trunk/tck11/test/java/org/apache/jdo/tck/pc/company/Address.java
incubator/jdo/trunk/tck11/test/java/org/apache/jdo/tck/pc/company/Company.java
incubator/jdo/trunk/tck11/test/java/org/apache/jdo/tck/pc/company/Department.java
incubator/jdo/trunk/tck11/test/java/org/apache/jdo/tck/pc/company/Insurance.java
incubator/jdo/trunk/tck11/test/java/org/apache/jdo/tck/pc/company/Person.java
incubator/jdo/trunk/tck11/test/java/org/apache/jdo/tck/pc/company/Project.java
incubator/jdo/trunk/tck11/test/java/org/apache/jdo/tck/pc/fieldtypes/AllTypes.java
incubator/jdo/trunk/tck11/test/java/org/apache/jdo/tck/pc/fieldtypes/ArrayCollections.java
incubator/jdo/trunk/tck11/test/java/org/apache/jdo/tck/pc/fieldtypes/ArrayListCollections.java
incubator/jdo/trunk/tck11/test/java/org/apache/jdo/tck/pc/fieldtypes/CollectionCollections.java
incubator/jdo/trunk/tck11/test/java/org/apache/jdo/tck/pc/fieldtypes/FieldsOfBigDecimal.java
incubator/jdo/trunk/tck11/test/java/org/apache/jdo/tck/pc/fieldtypes/FieldsOfBigInteger.java
incubator/jdo/trunk/tck11/test/java/org/apache/jdo/tck/pc/fieldtypes/FieldsOfBoolean.java
incubator/jdo/trunk/tck11/test/java/org/apache/jdo/tck/pc/fieldtypes/FieldsOfByte.java
incubator/jdo/trunk/tck11/test/java/org/apache/jdo/tck/pc/fieldtypes/FieldsOfCharacter.java
incubator/jdo/trunk/tck11/test/java/org/apache/jdo/tck/pc/fieldtypes/FieldsOfDate.java
incubator/jdo/trunk/tck11/test/java/org/apache/jdo/tck/pc/fieldtypes/FieldsOfDouble.java
incubator/jdo/trunk/tck11/test/java/org/apache/jdo/tck/pc/fieldtypes/FieldsOfFloat.java
incubator/jdo/trunk/tck11/test/java/org/apache/jdo/tck/pc/fieldtypes/FieldsOfInteger.java
incubator/jdo/trunk/tck11/test/java/org/apache/jdo/tck/pc/fieldtypes/FieldsOfLocale.java
incubator/jdo/trunk/tck11/test/java/org/apache/jdo/tck/pc/fieldtypes/FieldsOfLong.java
incubator/jdo/trunk/tck11/test/java/org/apache/jdo/tck/pc/fieldtypes/FieldsOfObject.java
incubator/jdo/trunk/tck11/test/java/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitiveboolean.java
incubator/jdo/trunk/tck11/test/java/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitivebyte.java
incubator/jdo/trunk/tck11/test/java/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitivechar.java
incubator/jdo/trunk/tck11/test/java/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitivedouble.java
incubator/jdo/trunk/tck11/test/java/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitivefloat.java
incubator/jdo/trunk/tck11/test/java/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitiveint.java
incubator/jdo/trunk/tck11/test/java/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitivelong.java
incubator/jdo/trunk/tck11/test/java/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitiveshort.java
incubator/jdo/trunk/tck11/test/java/org/apache/jdo/tck/pc/fieldtypes/FieldsOfShort.java
incubator/jdo/trunk/tck11/test/java/org/apache/jdo/tck/pc/fieldtypes/FieldsOfSimpleClass.java
incubator/jdo/trunk/tck11/test/java/org/apache/jdo/tck/pc/fieldtypes/FieldsOfSimpleInterface.java
incubator/jdo/trunk/tck11/test/java/org/apache/jdo/tck/pc/fieldtypes/FieldsOfString.java
incubator/jdo/trunk/tck11/test/java/org/apache/jdo/tck/pc/fieldtypes/HashMapStringKeyCollections.java
incubator/jdo/trunk/tck11/test/java/org/apache/jdo/tck/pc/fieldtypes/HashMapStringValueCollections.java
incubator/jdo/trunk/tck11/test/java/org/apache/jdo/tck/pc/fieldtypes/HashSetCollections.java
incubator/jdo/trunk/tck11/test/java/org/apache/jdo/tck/pc/fieldtypes/HashtableStringKeyCollections.java
incubator/jdo/trunk/tck11/test/java/org/apache/jdo/tck/pc/fieldtypes/HashtableStringValueCollections.java
incubator/jdo/trunk/tck11/test/java/org/apache/jdo/tck/pc/fieldtypes/LinkedListCollections.java
incubator/jdo/trunk/tck11/test/java/org/apache/jdo/tck/pc/fieldtypes/ListCollections.java
incubator/jdo/trunk/tck11/test/java/org/apache/jdo/tck/pc/fieldtypes/MapStringKeyCollections.java
incubator/jdo/trunk/tck11/test/java/org/apache/jdo/tck/pc/fieldtypes/MapStringValueCollections.java
incubator/jdo/trunk/tck11/test/java/org/apache/jdo/tck/pc/fieldtypes/SetCollections.java
incubator/jdo/trunk/tck11/test/java/org/apache/jdo/tck/pc/fieldtypes/SimpleClass.java
incubator/jdo/trunk/tck11/test/java/org/apache/jdo/tck/pc/fieldtypes/TreeMapStringKeyCollections.java
incubator/jdo/trunk/tck11/test/java/org/apache/jdo/tck/pc/fieldtypes/TreeMapStringValueCollections.java
incubator/jdo/trunk/tck11/test/java/org/apache/jdo/tck/pc/fieldtypes/TreeSetCollections.java
incubator/jdo/trunk/tck11/test/java/org/apache/jdo/tck/pc/fieldtypes/VectorCollections.java
incubator/jdo/trunk/tck11/test/java/org/apache/jdo/tck/pc/mylib/PCPoint.java
incubator/jdo/trunk/tck11/test/java/org/apache/jdo/tck/pc/mylib/PCPoint2.java
incubator/jdo/trunk/tck11/test/java/org/apache/jdo/tck/pc/mylib/PCRect.java
incubator/jdo/trunk/tck11/test/java/org/apache/jdo/tck/pc/mylib/PrimitiveTypes.java
Modified:
incubator/jdo/trunk/tck11/test/java/org/apache/jdo/tck/pc/company/Address.java
URL:
http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck11/test/java/org/apache/jdo/tck/pc/company/Address.java?view=diff&r1=159661&r2=159662
==============================================================================
---
incubator/jdo/trunk/tck11/test/java/org/apache/jdo/tck/pc/company/Address.java
(original)
+++
incubator/jdo/trunk/tck11/test/java/org/apache/jdo/tck/pc/company/Address.java
Thu Mar 31 20:42:49 2005
@@ -230,6 +230,10 @@
*/
public long addrid;
+ /** The name of the class of the target object.
+ */
+ public static String targetClassName =
"org.apache.jdo.tck.pc.company.address";
+
/** The required public, no-arg constructor. */
public Oid()
{
@@ -243,6 +247,11 @@
public Oid(long addrid) {
this.addrid = addrid;
}
+
+ public Oid(String s) { addrid = Long.parseLong(justTheId(s)); }
+
+ public String toString() { return getTargetClassName() + ": " +
addrid;}
+
/** */
public boolean equals(java.lang.Object obj) {
@@ -257,6 +266,17 @@
public int hashCode() {
return( (int) addrid );
}
+
+ protected static String justTheId(String str) {
+ return str.substring(str.indexOf(':') + 1);
+ }
+
+ /** Return the target class name.
+ * @return the target class name.
+ */
+ public String getTargetClassName() {
+ return targetClassName;
+ }
/** */
public int compareTo(Object obj) {
Modified:
incubator/jdo/trunk/tck11/test/java/org/apache/jdo/tck/pc/company/Company.java
URL:
http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck11/test/java/org/apache/jdo/tck/pc/company/Company.java?view=diff&r1=159661&r2=159662
==============================================================================
---
incubator/jdo/trunk/tck11/test/java/org/apache/jdo/tck/pc/company/Company.java
(original)
+++
incubator/jdo/trunk/tck11/test/java/org/apache/jdo/tck/pc/company/Company.java
Thu Mar 31 20:42:49 2005
@@ -241,6 +241,10 @@
* and type with a field in the <code>Company</code> class.
*/
public long companyid;
+
+ /** The name of the class of the target object.
+ */
+ public static String targetClassName =
"org.apache.jdo.tck.pc.company.Company";
/** The required public no-arg constructor. */
public Oid() { }
@@ -253,6 +257,11 @@
this.companyid = companyid;
}
+ public Oid(String s) { companyid = Long.parseLong(justTheId(s)); }
+
+ public String toString() { return getTargetClassName() + ": " +
companyid;}
+
+
/** */
public boolean equals(Object obj) {
if (obj==null || !this.getClass().equals(obj.getClass()))
@@ -267,6 +276,17 @@
public int hashCode() {
return (int)companyid;
}
+
+ protected static String justTheId(String str) {
+ return str.substring(str.indexOf(':') + 1);
+ }
+
+ /** Return the target class name.
+ * @return the target class name.
+ */
+ public String getTargetClassName() {
+ return targetClassName;
+ }
/** */
public int compareTo(Object obj) {
Modified:
incubator/jdo/trunk/tck11/test/java/org/apache/jdo/tck/pc/company/Department.java
URL:
http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck11/test/java/org/apache/jdo/tck/pc/company/Department.java?view=diff&r1=159661&r2=159662
==============================================================================
---
incubator/jdo/trunk/tck11/test/java/org/apache/jdo/tck/pc/company/Department.java
(original)
+++
incubator/jdo/trunk/tck11/test/java/org/apache/jdo/tck/pc/company/Department.java
Thu Mar 31 20:42:49 2005
@@ -308,6 +308,10 @@
* The required public, no-arg constructor.
*/
public Oid() { }
+
+ /** The name of the class of the target object.
+ */
+ public static String targetClassName =
"org.apache.jdo.tck.pc.company.Department";
/**
* A constructor to initialize the identifier field.
@@ -316,6 +320,10 @@
public Oid(long deptid) {
this.deptid = deptid;
}
+
+ public Oid(String s) { deptid = Long.parseLong(justTheId(s)); }
+
+ public String toString() { return getTargetClassName() + ": " +
deptid;}
/** */
public boolean equals(java.lang.Object obj) {
@@ -330,6 +338,17 @@
public int hashCode() {
return( (int) deptid );
}
+
+ protected static String justTheId(String str) {
+ return str.substring(str.indexOf(':') + 1);
+ }
+
+ /** Return the target class name.
+ * @return the target class name.
+ */
+ public String getTargetClassName() {
+ return targetClassName;
+ }
/** */
public int compareTo(Object obj) {
Modified:
incubator/jdo/trunk/tck11/test/java/org/apache/jdo/tck/pc/company/Insurance.java
URL:
http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck11/test/java/org/apache/jdo/tck/pc/company/Insurance.java?view=diff&r1=159661&r2=159662
==============================================================================
---
incubator/jdo/trunk/tck11/test/java/org/apache/jdo/tck/pc/company/Insurance.java
(original)
+++
incubator/jdo/trunk/tck11/test/java/org/apache/jdo/tck/pc/company/Insurance.java
Thu Mar 31 20:42:49 2005
@@ -188,6 +188,11 @@
*/
public long insid;
+ /** The name of the class of the target object.
+ */
+ public static String targetClassName =
"org.apache.jdo.tck.pc.company.Insurance";
+
+
/**
* The required public no-args constructor.
*/
@@ -200,6 +205,11 @@
public Oid(long insid) {
this.insid = insid;
}
+
+ public Oid(String s) { insid = Long.parseLong(justTheId(s)); }
+
+ public String toString() { return getTargetClassName() + ": " +
insid;}
+
/** */
public boolean equals(java.lang.Object obj) {
@@ -214,6 +224,17 @@
public int hashCode() {
return( (int) insid );
}
+
+ protected static String justTheId(String str) {
+ return str.substring(str.indexOf(':') + 1);
+ }
+
+ /** Return the target class name.
+ * @return the target class name.
+ */
+ public String getTargetClassName() {
+ return targetClassName;
+ }
/** */
public int compareTo(Object obj) {
Modified:
incubator/jdo/trunk/tck11/test/java/org/apache/jdo/tck/pc/company/Person.java
URL:
http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck11/test/java/org/apache/jdo/tck/pc/company/Person.java?view=diff&r1=159661&r2=159662
==============================================================================
---
incubator/jdo/trunk/tck11/test/java/org/apache/jdo/tck/pc/company/Person.java
(original)
+++
incubator/jdo/trunk/tck11/test/java/org/apache/jdo/tck/pc/company/Person.java
Thu Mar 31 20:42:49 2005
@@ -330,6 +330,14 @@
public Oid(long personid) {
this.personid = personid;
}
+
+ public Oid(String s) { personid = Long.parseLong(justTheId(s)); }
+
+ /** The name of the class of the target object.
+ */
+ public static String targetClassName =
"org.apache.jdo.tck.pc.company.Person";
+
+ public String toString() { return getTargetClassName() + ": " +
personid;}
/** */
public boolean equals(java.lang.Object obj) {
@@ -344,6 +352,17 @@
public int hashCode() {
return( (int) personid );
}
+
+ protected static String justTheId(String str) {
+ return str.substring(str.indexOf(':') + 1);
+ }
+
+ /** Return the target class name.
+ * @return the target class name.
+ */
+ public String getTargetClassName() {
+ return targetClassName;
+ }
/** */
public int compareTo(Object obj) {
Modified:
incubator/jdo/trunk/tck11/test/java/org/apache/jdo/tck/pc/company/Project.java
URL:
http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck11/test/java/org/apache/jdo/tck/pc/company/Project.java?view=diff&r1=159661&r2=159662
==============================================================================
---
incubator/jdo/trunk/tck11/test/java/org/apache/jdo/tck/pc/company/Project.java
(original)
+++
incubator/jdo/trunk/tck11/test/java/org/apache/jdo/tck/pc/company/Project.java
Thu Mar 31 20:42:49 2005
@@ -257,6 +257,10 @@
* <code>Project</code> class in both name and type.
*/
public long projid;
+
+ /** The name of the class of the target object.
+ */
+ public static String targetClassName =
"org.apache.jdo.tck.pc.company.Projectt";
/**
* The required public no-arg constructor.
@@ -270,6 +274,10 @@
public Oid(long projid) {
this.projid = projid;
}
+
+ public Oid(String s) { projid = Long.parseLong(justTheId(s)); }
+
+ public String toString() { return getTargetClassName() + ": " +
projid;}
/** */
public boolean equals(java.lang.Object obj) {
@@ -284,6 +292,17 @@
public int hashCode() {
return( (int) projid );
}
+
+ protected static String justTheId(String str) {
+ return str.substring(str.indexOf(':') + 1);
+ }
+
+ /** Return the target class name.
+ * @return the target class name.
+ */
+ public String getTargetClassName() {
+ return targetClassName;
+ }
/** */
public int compareTo(Object obj) {
Modified:
incubator/jdo/trunk/tck11/test/java/org/apache/jdo/tck/pc/fieldtypes/AllTypes.java
URL:
http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck11/test/java/org/apache/jdo/tck/pc/fieldtypes/AllTypes.java?view=diff&r1=159661&r2=159662
==============================================================================
---
incubator/jdo/trunk/tck11/test/java/org/apache/jdo/tck/pc/fieldtypes/AllTypes.java
(original)
+++
incubator/jdo/trunk/tck11/test/java/org/apache/jdo/tck/pc/fieldtypes/AllTypes.java
Thu Mar 31 20:42:49 2005
@@ -298,7 +298,7 @@
public Oid() {
}
- public Oid(String s) { id = Integer.parseInt(s); }
+ public Oid(String s) { id = Integer.parseInt(justTheId(s)); }
public String toString() { return this.getClass().getName() + ": " +
id;}
@@ -310,6 +310,10 @@
return k.id == this.id;
}
return false;
+ }
+
+ protected static String justTheId(String str) {
+ return str.substring(str.indexOf(':') + 1);
}
}
Modified:
incubator/jdo/trunk/tck11/test/java/org/apache/jdo/tck/pc/fieldtypes/ArrayCollections.java
URL:
http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck11/test/java/org/apache/jdo/tck/pc/fieldtypes/ArrayCollections.java?view=diff&r1=159661&r2=159662
==============================================================================
---
incubator/jdo/trunk/tck11/test/java/org/apache/jdo/tck/pc/fieldtypes/ArrayCollections.java
(original)
+++
incubator/jdo/trunk/tck11/test/java/org/apache/jdo/tck/pc/fieldtypes/ArrayCollections.java
Thu Mar 31 20:42:49 2005
@@ -251,7 +251,7 @@
public Oid() {
}
- public Oid(String s) { identifier = Integer.parseInt(s); }
+ public Oid(String s) { identifier = Integer.parseInt(justTheId(s)); }
public String toString() { return this.getClass().getName() + ": " +
identifier;}
@@ -263,6 +263,10 @@
return k.identifier == this.identifier;
}
return false;
+ }
+
+ protected static String justTheId(String str) {
+ return str.substring(str.indexOf(':') + 1);
}
}
Modified:
incubator/jdo/trunk/tck11/test/java/org/apache/jdo/tck/pc/fieldtypes/ArrayListCollections.java
URL:
http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck11/test/java/org/apache/jdo/tck/pc/fieldtypes/ArrayListCollections.java?view=diff&r1=159661&r2=159662
==============================================================================
---
incubator/jdo/trunk/tck11/test/java/org/apache/jdo/tck/pc/fieldtypes/ArrayListCollections.java
(original)
+++
incubator/jdo/trunk/tck11/test/java/org/apache/jdo/tck/pc/fieldtypes/ArrayListCollections.java
Thu Mar 31 20:42:49 2005
@@ -348,7 +348,7 @@
public Oid() {
}
- public Oid(String s) { identifier = Integer.parseInt(s); }
+ public Oid(String s) { identifier = Integer.parseInt(justTheId(s)); }
public String toString() { return this.getClass().getName() + ": " +
identifier;}
@@ -360,6 +360,10 @@
return k.identifier == this.identifier;
}
return false;
+ }
+
+ protected static String justTheId(String str) {
+ return str.substring(str.indexOf(':') + 1);
}
}
Modified:
incubator/jdo/trunk/tck11/test/java/org/apache/jdo/tck/pc/fieldtypes/CollectionCollections.java
URL:
http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck11/test/java/org/apache/jdo/tck/pc/fieldtypes/CollectionCollections.java?view=diff&r1=159661&r2=159662
==============================================================================
---
incubator/jdo/trunk/tck11/test/java/org/apache/jdo/tck/pc/fieldtypes/CollectionCollections.java
(original)
+++
incubator/jdo/trunk/tck11/test/java/org/apache/jdo/tck/pc/fieldtypes/CollectionCollections.java
Thu Mar 31 20:42:49 2005
@@ -348,7 +348,7 @@
public Oid() {
}
- public Oid(String s) { identifier = Integer.parseInt(s); }
+ public Oid(String s) { identifier = Integer.parseInt(justTheId(s)); }
public String toString() { return this.getClass().getName() + ": " +
identifier;}
@@ -360,6 +360,10 @@
return k.identifier == this.identifier;
}
return false;
+ }
+
+ protected static String justTheId(String str) {
+ return str.substring(str.indexOf(':') + 1);
}
}
Modified:
incubator/jdo/trunk/tck11/test/java/org/apache/jdo/tck/pc/fieldtypes/FieldsOfBigDecimal.java
URL:
http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck11/test/java/org/apache/jdo/tck/pc/fieldtypes/FieldsOfBigDecimal.java?view=diff&r1=159661&r2=159662
==============================================================================
---
incubator/jdo/trunk/tck11/test/java/org/apache/jdo/tck/pc/fieldtypes/FieldsOfBigDecimal.java
(original)
+++
incubator/jdo/trunk/tck11/test/java/org/apache/jdo/tck/pc/fieldtypes/FieldsOfBigDecimal.java
Thu Mar 31 20:42:49 2005
@@ -1068,7 +1068,7 @@
public Oid() {
}
- public Oid(String s) { identifier = Integer.parseInt(s); }
+ public Oid(String s) { identifier = Integer.parseInt(justTheId(s)); }
public String toString() { return this.getClass().getName() + ": " +
identifier;}
@@ -1080,6 +1080,10 @@
return k.identifier == this.identifier;
}
return false;
+ }
+
+ protected static String justTheId(String str) {
+ return str.substring(str.indexOf(':') + 1);
}
}
Modified:
incubator/jdo/trunk/tck11/test/java/org/apache/jdo/tck/pc/fieldtypes/FieldsOfBigInteger.java
URL:
http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck11/test/java/org/apache/jdo/tck/pc/fieldtypes/FieldsOfBigInteger.java?view=diff&r1=159661&r2=159662
==============================================================================
---
incubator/jdo/trunk/tck11/test/java/org/apache/jdo/tck/pc/fieldtypes/FieldsOfBigInteger.java
(original)
+++
incubator/jdo/trunk/tck11/test/java/org/apache/jdo/tck/pc/fieldtypes/FieldsOfBigInteger.java
Thu Mar 31 20:42:49 2005
@@ -1068,7 +1068,7 @@
public Oid() {
}
- public Oid(String s) { identifier = Integer.parseInt(s); }
+ public Oid(String s) { identifier = Integer.parseInt(justTheId(s)); }
public String toString() { return this.getClass().getName() + ": " +
identifier;}
@@ -1080,6 +1080,10 @@
return k.identifier == this.identifier;
}
return false;
+ }
+
+ protected static String justTheId(String str) {
+ return str.substring(str.indexOf(':') + 1);
}
}
Modified:
incubator/jdo/trunk/tck11/test/java/org/apache/jdo/tck/pc/fieldtypes/FieldsOfBoolean.java
URL:
http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck11/test/java/org/apache/jdo/tck/pc/fieldtypes/FieldsOfBoolean.java?view=diff&r1=159661&r2=159662
==============================================================================
---
incubator/jdo/trunk/tck11/test/java/org/apache/jdo/tck/pc/fieldtypes/FieldsOfBoolean.java
(original)
+++
incubator/jdo/trunk/tck11/test/java/org/apache/jdo/tck/pc/fieldtypes/FieldsOfBoolean.java
Thu Mar 31 20:42:49 2005
@@ -1067,7 +1067,7 @@
public Oid() {
}
- public Oid(String s) { identifier = Integer.parseInt(s); }
+ public Oid(String s) { identifier = Integer.parseInt(justTheId(s)); }
public String toString() { return this.getClass().getName() + ": " +
identifier;}
@@ -1079,6 +1079,10 @@
return k.identifier == this.identifier;
}
return false;
+ }
+
+ protected static String justTheId(String str) {
+ return str.substring(str.indexOf(':') + 1);
}
}
Modified:
incubator/jdo/trunk/tck11/test/java/org/apache/jdo/tck/pc/fieldtypes/FieldsOfByte.java
URL:
http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck11/test/java/org/apache/jdo/tck/pc/fieldtypes/FieldsOfByte.java?view=diff&r1=159661&r2=159662
==============================================================================
---
incubator/jdo/trunk/tck11/test/java/org/apache/jdo/tck/pc/fieldtypes/FieldsOfByte.java
(original)
+++
incubator/jdo/trunk/tck11/test/java/org/apache/jdo/tck/pc/fieldtypes/FieldsOfByte.java
Thu Mar 31 20:42:49 2005
@@ -1067,7 +1067,7 @@
public Oid() {
}
- public Oid(String s) { identifier = Integer.parseInt(s); }
+ public Oid(String s) { identifier = Integer.parseInt(justTheId(s)); }
public String toString() { return this.getClass().getName() + ": " +
identifier;}
@@ -1079,6 +1079,10 @@
return k.identifier == this.identifier;
}
return false;
+ }
+
+ protected static String justTheId(String str) {
+ return str.substring(str.indexOf(':') + 1);
}
}
Modified:
incubator/jdo/trunk/tck11/test/java/org/apache/jdo/tck/pc/fieldtypes/FieldsOfCharacter.java
URL:
http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck11/test/java/org/apache/jdo/tck/pc/fieldtypes/FieldsOfCharacter.java?view=diff&r1=159661&r2=159662
==============================================================================
---
incubator/jdo/trunk/tck11/test/java/org/apache/jdo/tck/pc/fieldtypes/FieldsOfCharacter.java
(original)
+++
incubator/jdo/trunk/tck11/test/java/org/apache/jdo/tck/pc/fieldtypes/FieldsOfCharacter.java
Thu Mar 31 20:42:49 2005
@@ -1067,7 +1067,7 @@
public Oid() {
}
- public Oid(String s) { identifier = Integer.parseInt(s); }
+ public Oid(String s) { identifier = Integer.parseInt(justTheId(s)); }
public String toString() { return this.getClass().getName() + ": " +
identifier;}
@@ -1079,6 +1079,10 @@
return k.identifier == this.identifier;
}
return false;
+ }
+
+ protected static String justTheId(String str) {
+ return str.substring(str.indexOf(':') + 1);
}
}
Modified:
incubator/jdo/trunk/tck11/test/java/org/apache/jdo/tck/pc/fieldtypes/FieldsOfDate.java
URL:
http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck11/test/java/org/apache/jdo/tck/pc/fieldtypes/FieldsOfDate.java?view=diff&r1=159661&r2=159662
==============================================================================
---
incubator/jdo/trunk/tck11/test/java/org/apache/jdo/tck/pc/fieldtypes/FieldsOfDate.java
(original)
+++
incubator/jdo/trunk/tck11/test/java/org/apache/jdo/tck/pc/fieldtypes/FieldsOfDate.java
Thu Mar 31 20:42:49 2005
@@ -1068,7 +1068,7 @@
public Oid() {
}
- public Oid(String s) { identifier = Integer.parseInt(s); }
+ public Oid(String s) { identifier = Integer.parseInt(justTheId(s)); }
public String toString() { return this.getClass().getName() + ": " +
identifier;}
@@ -1080,6 +1080,10 @@
return k.identifier == this.identifier;
}
return false;
+ }
+
+ protected static String justTheId(String str) {
+ return str.substring(str.indexOf(':') + 1);
}
}
Modified:
incubator/jdo/trunk/tck11/test/java/org/apache/jdo/tck/pc/fieldtypes/FieldsOfDouble.java
URL:
http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck11/test/java/org/apache/jdo/tck/pc/fieldtypes/FieldsOfDouble.java?view=diff&r1=159661&r2=159662
==============================================================================
---
incubator/jdo/trunk/tck11/test/java/org/apache/jdo/tck/pc/fieldtypes/FieldsOfDouble.java
(original)
+++
incubator/jdo/trunk/tck11/test/java/org/apache/jdo/tck/pc/fieldtypes/FieldsOfDouble.java
Thu Mar 31 20:42:49 2005
@@ -1067,7 +1067,7 @@
public Oid() {
}
- public Oid(String s) { identifier = Integer.parseInt(s); }
+ public Oid(String s) { identifier = Integer.parseInt(justTheId(s)); }
public String toString() { return this.getClass().getName() + ": " +
identifier;}
@@ -1079,6 +1079,10 @@
return k.identifier == this.identifier;
}
return false;
+ }
+
+ protected static String justTheId(String str) {
+ return str.substring(str.indexOf(':') + 1);
}
}
Modified:
incubator/jdo/trunk/tck11/test/java/org/apache/jdo/tck/pc/fieldtypes/FieldsOfFloat.java
URL:
http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck11/test/java/org/apache/jdo/tck/pc/fieldtypes/FieldsOfFloat.java?view=diff&r1=159661&r2=159662
==============================================================================
---
incubator/jdo/trunk/tck11/test/java/org/apache/jdo/tck/pc/fieldtypes/FieldsOfFloat.java
(original)
+++
incubator/jdo/trunk/tck11/test/java/org/apache/jdo/tck/pc/fieldtypes/FieldsOfFloat.java
Thu Mar 31 20:42:49 2005
@@ -1067,7 +1067,7 @@
public Oid() {
}
- public Oid(String s) { identifier = Integer.parseInt(s); }
+ public Oid(String s) { identifier = Integer.parseInt(justTheId(s)); }
public String toString() { return this.getClass().getName() + ": " +
identifier;}
@@ -1079,6 +1079,10 @@
return k.identifier == this.identifier;
}
return false;
+ }
+
+ protected static String justTheId(String str) {
+ return str.substring(str.indexOf(':') + 1);
}
}
Modified:
incubator/jdo/trunk/tck11/test/java/org/apache/jdo/tck/pc/fieldtypes/FieldsOfInteger.java
URL:
http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck11/test/java/org/apache/jdo/tck/pc/fieldtypes/FieldsOfInteger.java?view=diff&r1=159661&r2=159662
==============================================================================
---
incubator/jdo/trunk/tck11/test/java/org/apache/jdo/tck/pc/fieldtypes/FieldsOfInteger.java
(original)
+++
incubator/jdo/trunk/tck11/test/java/org/apache/jdo/tck/pc/fieldtypes/FieldsOfInteger.java
Thu Mar 31 20:42:49 2005
@@ -1067,7 +1067,7 @@
public Oid() {
}
- public Oid(String s) { identifier = Integer.parseInt(s); }
+ public Oid(String s) { identifier = Integer.parseInt(justTheId(s)); }
public String toString() { return this.getClass().getName() + ": " +
identifier;}
@@ -1080,6 +1080,9 @@
}
return false;
}
-
+
+ protected static String justTheId(String str) {
+ return str.substring(str.indexOf(':') + 1);
+ }
}
}
Modified:
incubator/jdo/trunk/tck11/test/java/org/apache/jdo/tck/pc/fieldtypes/FieldsOfLocale.java
URL:
http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck11/test/java/org/apache/jdo/tck/pc/fieldtypes/FieldsOfLocale.java?view=diff&r1=159661&r2=159662
==============================================================================
---
incubator/jdo/trunk/tck11/test/java/org/apache/jdo/tck/pc/fieldtypes/FieldsOfLocale.java
(original)
+++
incubator/jdo/trunk/tck11/test/java/org/apache/jdo/tck/pc/fieldtypes/FieldsOfLocale.java
Thu Mar 31 20:42:49 2005
@@ -1068,7 +1068,7 @@
public Oid() {
}
- public Oid(String s) { identifier = Integer.parseInt(s); }
+ public Oid(String s) { identifier = Integer.parseInt(justTheId(s)); }
public String toString() { return this.getClass().getName() + ": " +
identifier;}
@@ -1080,6 +1080,10 @@
return k.identifier == this.identifier;
}
return false;
+ }
+
+ protected static String justTheId(String str) {
+ return str.substring(str.indexOf(':') + 1);
}
}
Modified:
incubator/jdo/trunk/tck11/test/java/org/apache/jdo/tck/pc/fieldtypes/FieldsOfLong.java
URL:
http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck11/test/java/org/apache/jdo/tck/pc/fieldtypes/FieldsOfLong.java?view=diff&r1=159661&r2=159662
==============================================================================
---
incubator/jdo/trunk/tck11/test/java/org/apache/jdo/tck/pc/fieldtypes/FieldsOfLong.java
(original)
+++
incubator/jdo/trunk/tck11/test/java/org/apache/jdo/tck/pc/fieldtypes/FieldsOfLong.java
Thu Mar 31 20:42:49 2005
@@ -1067,7 +1067,7 @@
public Oid() {
}
- public Oid(String s) { identifier = Integer.parseInt(s); }
+ public Oid(String s) { identifier = Integer.parseInt(justTheId(s)); }
public String toString() { return this.getClass().getName() + ": " +
identifier;}
@@ -1079,6 +1079,10 @@
return k.identifier == this.identifier;
}
return false;
+ }
+
+ protected static String justTheId(String str) {
+ return str.substring(str.indexOf(':') + 1);
}
}
Modified:
incubator/jdo/trunk/tck11/test/java/org/apache/jdo/tck/pc/fieldtypes/FieldsOfObject.java
URL:
http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck11/test/java/org/apache/jdo/tck/pc/fieldtypes/FieldsOfObject.java?view=diff&r1=159661&r2=159662
==============================================================================
---
incubator/jdo/trunk/tck11/test/java/org/apache/jdo/tck/pc/fieldtypes/FieldsOfObject.java
(original)
+++
incubator/jdo/trunk/tck11/test/java/org/apache/jdo/tck/pc/fieldtypes/FieldsOfObject.java
Thu Mar 31 20:42:49 2005
@@ -1067,7 +1067,7 @@
public Oid() {
}
- public Oid(String s) { identifier = Integer.parseInt(s); }
+ public Oid(String s) { identifier = Integer.parseInt(justTheId(s)); }
public String toString() { return this.getClass().getName() + ": " +
identifier;}
@@ -1079,6 +1079,10 @@
return k.identifier == this.identifier;
}
return false;
+ }
+
+ protected static String justTheId(String str) {
+ return str.substring(str.indexOf(':') + 1);
}
}
Modified:
incubator/jdo/trunk/tck11/test/java/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitiveboolean.java
URL:
http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck11/test/java/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitiveboolean.java?view=diff&r1=159661&r2=159662
==============================================================================
---
incubator/jdo/trunk/tck11/test/java/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitiveboolean.java
(original)
+++
incubator/jdo/trunk/tck11/test/java/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitiveboolean.java
Thu Mar 31 20:42:49 2005
@@ -1067,7 +1067,7 @@
public Oid() {
}
- public Oid(String s) { identifier = Integer.parseInt(s); }
+ public Oid(String s) { identifier = Integer.parseInt(justTheId(s)); }
public String toString() { return this.getClass().getName() + ": " +
identifier;}
@@ -1079,6 +1079,10 @@
return k.identifier == this.identifier;
}
return false;
+ }
+
+ protected static String justTheId(String str) {
+ return str.substring(str.indexOf(':') + 1);
}
}
Modified:
incubator/jdo/trunk/tck11/test/java/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitivebyte.java
URL:
http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck11/test/java/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitivebyte.java?view=diff&r1=159661&r2=159662
==============================================================================
---
incubator/jdo/trunk/tck11/test/java/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitivebyte.java
(original)
+++
incubator/jdo/trunk/tck11/test/java/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitivebyte.java
Thu Mar 31 20:42:49 2005
@@ -1067,7 +1067,7 @@
public Oid() {
}
- public Oid(String s) { identifier = Integer.parseInt(s); }
+ public Oid(String s) { identifier = Integer.parseInt(justTheId(s)); }
public String toString() { return this.getClass().getName() + ": " +
identifier;}
@@ -1080,6 +1080,9 @@
}
return false;
}
-
+
+ protected static String justTheId(String str) {
+ return str.substring(str.indexOf(':') + 1);
+ }
}
}
Modified:
incubator/jdo/trunk/tck11/test/java/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitivechar.java
URL:
http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck11/test/java/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitivechar.java?view=diff&r1=159661&r2=159662
==============================================================================
---
incubator/jdo/trunk/tck11/test/java/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitivechar.java
(original)
+++
incubator/jdo/trunk/tck11/test/java/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitivechar.java
Thu Mar 31 20:42:49 2005
@@ -1067,7 +1067,7 @@
public Oid() {
}
- public Oid(String s) { identifier = Integer.parseInt(s); }
+ public Oid(String s) { identifier = Integer.parseInt(justTheId(s)); }
public String toString() { return this.getClass().getName() + ": " +
identifier;}
@@ -1079,6 +1079,10 @@
return k.identifier == this.identifier;
}
return false;
+ }
+
+ protected static String justTheId(String str) {
+ return str.substring(str.indexOf(':') + 1);
}
}
Modified:
incubator/jdo/trunk/tck11/test/java/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitivedouble.java
URL:
http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck11/test/java/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitivedouble.java?view=diff&r1=159661&r2=159662
==============================================================================
---
incubator/jdo/trunk/tck11/test/java/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitivedouble.java
(original)
+++
incubator/jdo/trunk/tck11/test/java/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitivedouble.java
Thu Mar 31 20:42:49 2005
@@ -1067,7 +1067,7 @@
public Oid() {
}
- public Oid(String s) { identifier = Integer.parseInt(s); }
+ public Oid(String s) { identifier = Integer.parseInt(justTheId(s)); }
public String toString() { return this.getClass().getName() + ": " +
identifier;}
@@ -1080,6 +1080,9 @@
}
return false;
}
-
+
+ protected static String justTheId(String str) {
+ return str.substring(str.indexOf(':') + 1);
+ }
}
}
Modified:
incubator/jdo/trunk/tck11/test/java/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitivefloat.java
URL:
http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck11/test/java/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitivefloat.java?view=diff&r1=159661&r2=159662
==============================================================================
---
incubator/jdo/trunk/tck11/test/java/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitivefloat.java
(original)
+++
incubator/jdo/trunk/tck11/test/java/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitivefloat.java
Thu Mar 31 20:42:49 2005
@@ -1067,7 +1067,7 @@
public Oid() {
}
- public Oid(String s) { identifier = Integer.parseInt(s); }
+ public Oid(String s) { identifier = Integer.parseInt(justTheId(s)); }
public String toString() { return this.getClass().getName() + ": " +
identifier;}
@@ -1079,6 +1079,10 @@
return k.identifier == this.identifier;
}
return false;
+ }
+
+ protected static String justTheId(String str) {
+ return str.substring(str.indexOf(':') + 1);
}
}
Modified:
incubator/jdo/trunk/tck11/test/java/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitiveint.java
URL:
http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck11/test/java/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitiveint.java?view=diff&r1=159661&r2=159662
==============================================================================
---
incubator/jdo/trunk/tck11/test/java/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitiveint.java
(original)
+++
incubator/jdo/trunk/tck11/test/java/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitiveint.java
Thu Mar 31 20:42:49 2005
@@ -1067,7 +1067,7 @@
public Oid() {
}
- public Oid(String s) { identifier = Integer.parseInt(s); }
+ public Oid(String s) { identifier = Integer.parseInt(justTheId(s)); }
public String toString() { return this.getClass().getName() + ": " +
identifier;}
@@ -1079,6 +1079,10 @@
return k.identifier == this.identifier;
}
return false;
+ }
+
+ protected static String justTheId(String str) {
+ return str.substring(str.indexOf(':') + 1);
}
}
Modified:
incubator/jdo/trunk/tck11/test/java/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitivelong.java
URL:
http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck11/test/java/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitivelong.java?view=diff&r1=159661&r2=159662
==============================================================================
---
incubator/jdo/trunk/tck11/test/java/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitivelong.java
(original)
+++
incubator/jdo/trunk/tck11/test/java/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitivelong.java
Thu Mar 31 20:42:49 2005
@@ -1067,7 +1067,7 @@
public Oid() {
}
- public Oid(String s) { identifier = Integer.parseInt(s); }
+ public Oid(String s) { identifier = Integer.parseInt(justTheId(s)); }
public String toString() { return this.getClass().getName() + ": " +
identifier;}
@@ -1080,6 +1080,9 @@
}
return false;
}
-
+
+ protected static String justTheId(String str) {
+ return str.substring(str.indexOf(':') + 1);
+ }
}
}
Modified:
incubator/jdo/trunk/tck11/test/java/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitiveshort.java
URL:
http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck11/test/java/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitiveshort.java?view=diff&r1=159661&r2=159662
==============================================================================
---
incubator/jdo/trunk/tck11/test/java/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitiveshort.java
(original)
+++
incubator/jdo/trunk/tck11/test/java/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitiveshort.java
Thu Mar 31 20:42:49 2005
@@ -1067,7 +1067,7 @@
public Oid() {
}
- public Oid(String s) { identifier = Integer.parseInt(s); }
+ public Oid(String s) { identifier = Integer.parseInt(justTheId(s)); }
public String toString() { return this.getClass().getName() + ": " +
identifier;}
@@ -1079,6 +1079,10 @@
return k.identifier == this.identifier;
}
return false;
+ }
+
+ protected static String justTheId(String str) {
+ return str.substring(str.indexOf(':') + 1);
}
}
Modified:
incubator/jdo/trunk/tck11/test/java/org/apache/jdo/tck/pc/fieldtypes/FieldsOfShort.java
URL:
http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck11/test/java/org/apache/jdo/tck/pc/fieldtypes/FieldsOfShort.java?view=diff&r1=159661&r2=159662
==============================================================================
---
incubator/jdo/trunk/tck11/test/java/org/apache/jdo/tck/pc/fieldtypes/FieldsOfShort.java
(original)
+++
incubator/jdo/trunk/tck11/test/java/org/apache/jdo/tck/pc/fieldtypes/FieldsOfShort.java
Thu Mar 31 20:42:49 2005
@@ -1067,7 +1067,7 @@
public Oid() {
}
- public Oid(String s) { identifier = Integer.parseInt(s); }
+ public Oid(String s) { identifier = Integer.parseInt(justTheId(s)); }
public String toString() { return this.getClass().getName() + ": " +
identifier;}
@@ -1079,6 +1079,10 @@
return k.identifier == this.identifier;
}
return false;
+ }
+
+ protected static String justTheId(String str) {
+ return str.substring(str.indexOf(':') + 1);
}
}
Modified:
incubator/jdo/trunk/tck11/test/java/org/apache/jdo/tck/pc/fieldtypes/FieldsOfSimpleClass.java
URL:
http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck11/test/java/org/apache/jdo/tck/pc/fieldtypes/FieldsOfSimpleClass.java?view=diff&r1=159661&r2=159662
==============================================================================
---
incubator/jdo/trunk/tck11/test/java/org/apache/jdo/tck/pc/fieldtypes/FieldsOfSimpleClass.java
(original)
+++
incubator/jdo/trunk/tck11/test/java/org/apache/jdo/tck/pc/fieldtypes/FieldsOfSimpleClass.java
Thu Mar 31 20:42:49 2005
@@ -1067,7 +1067,7 @@
public Oid() {
}
- public Oid(String s) { identifier = Integer.parseInt(s); }
+ public Oid(String s) { identifier = Integer.parseInt(justTheId(s)); }
public String toString() { return this.getClass().getName() + ": " +
identifier;}
@@ -1079,6 +1079,10 @@
return k.identifier == this.identifier;
}
return false;
+ }
+
+ protected static String justTheId(String str) {
+ return str.substring(str.indexOf(':') + 1);
}
}
Modified:
incubator/jdo/trunk/tck11/test/java/org/apache/jdo/tck/pc/fieldtypes/FieldsOfSimpleInterface.java
URL:
http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck11/test/java/org/apache/jdo/tck/pc/fieldtypes/FieldsOfSimpleInterface.java?view=diff&r1=159661&r2=159662
==============================================================================
---
incubator/jdo/trunk/tck11/test/java/org/apache/jdo/tck/pc/fieldtypes/FieldsOfSimpleInterface.java
(original)
+++
incubator/jdo/trunk/tck11/test/java/org/apache/jdo/tck/pc/fieldtypes/FieldsOfSimpleInterface.java
Thu Mar 31 20:42:49 2005
@@ -1067,7 +1067,7 @@
public Oid() {
}
- public Oid(String s) { identifier = Integer.parseInt(s); }
+ public Oid(String s) { identifier = Integer.parseInt(justTheId(s)); }
public String toString() { return this.getClass().getName() + ": " +
identifier;}
@@ -1079,6 +1079,10 @@
return k.identifier == this.identifier;
}
return false;
+ }
+
+ protected static String justTheId(String str) {
+ return str.substring(str.indexOf(':') + 1);
}
}
Modified:
incubator/jdo/trunk/tck11/test/java/org/apache/jdo/tck/pc/fieldtypes/FieldsOfString.java
URL:
http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck11/test/java/org/apache/jdo/tck/pc/fieldtypes/FieldsOfString.java?view=diff&r1=159661&r2=159662
==============================================================================
---
incubator/jdo/trunk/tck11/test/java/org/apache/jdo/tck/pc/fieldtypes/FieldsOfString.java
(original)
+++
incubator/jdo/trunk/tck11/test/java/org/apache/jdo/tck/pc/fieldtypes/FieldsOfString.java
Thu Mar 31 20:42:49 2005
@@ -1067,7 +1067,7 @@
public Oid() {
}
- public Oid(String s) { identifier = Integer.parseInt(s); }
+ public Oid(String s) { identifier = Integer.parseInt(justTheId(s)); }
public String toString() { return this.getClass().getName() + ": " +
identifier;}
@@ -1079,6 +1079,10 @@
return k.identifier == this.identifier;
}
return false;
+ }
+
+ protected static String justTheId(String str) {
+ return str.substring(str.indexOf(':') + 1);
}
}
Modified:
incubator/jdo/trunk/tck11/test/java/org/apache/jdo/tck/pc/fieldtypes/HashMapStringKeyCollections.java
URL:
http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck11/test/java/org/apache/jdo/tck/pc/fieldtypes/HashMapStringKeyCollections.java?view=diff&r1=159661&r2=159662
==============================================================================
---
incubator/jdo/trunk/tck11/test/java/org/apache/jdo/tck/pc/fieldtypes/HashMapStringKeyCollections.java
(original)
+++
incubator/jdo/trunk/tck11/test/java/org/apache/jdo/tck/pc/fieldtypes/HashMapStringKeyCollections.java
Thu Mar 31 20:42:49 2005
@@ -936,7 +936,7 @@
public Oid() {
}
- public Oid(String s) { identifier = Integer.parseInt(s); }
+ public Oid(String s) { identifier = Integer.parseInt(justTheId(s)); }
public String toString() { return this.getClass().getName() + ": " +
identifier;}
@@ -948,6 +948,10 @@
return k.identifier == this.identifier;
}
return false;
+ }
+
+ protected static String justTheId(String str) {
+ return str.substring(str.indexOf(':') + 1);
}
}
Modified:
incubator/jdo/trunk/tck11/test/java/org/apache/jdo/tck/pc/fieldtypes/HashMapStringValueCollections.java
URL:
http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck11/test/java/org/apache/jdo/tck/pc/fieldtypes/HashMapStringValueCollections.java?view=diff&r1=159661&r2=159662
==============================================================================
---
incubator/jdo/trunk/tck11/test/java/org/apache/jdo/tck/pc/fieldtypes/HashMapStringValueCollections.java
(original)
+++
incubator/jdo/trunk/tck11/test/java/org/apache/jdo/tck/pc/fieldtypes/HashMapStringValueCollections.java
Thu Mar 31 20:42:49 2005
@@ -873,7 +873,7 @@
public Oid() {
}
- public Oid(String s) { identifier = Integer.parseInt(s); }
+ public Oid(String s) { identifier = Integer.parseInt(justTheId(s)); }
public String toString() { return this.getClass().getName() + ": " +
identifier;}
@@ -885,6 +885,10 @@
return k.identifier == this.identifier;
}
return false;
+ }
+
+ protected static String justTheId(String str) {
+ return str.substring(str.indexOf(':') + 1);
}
}
Modified:
incubator/jdo/trunk/tck11/test/java/org/apache/jdo/tck/pc/fieldtypes/HashSetCollections.java
URL:
http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck11/test/java/org/apache/jdo/tck/pc/fieldtypes/HashSetCollections.java?view=diff&r1=159661&r2=159662
==============================================================================
---
incubator/jdo/trunk/tck11/test/java/org/apache/jdo/tck/pc/fieldtypes/HashSetCollections.java
(original)
+++
incubator/jdo/trunk/tck11/test/java/org/apache/jdo/tck/pc/fieldtypes/HashSetCollections.java
Thu Mar 31 20:42:49 2005
@@ -348,7 +348,7 @@
public Oid() {
}
- public Oid(String s) { identifier = Integer.parseInt(s); }
+ public Oid(String s) { identifier = Integer.parseInt(justTheId(s)); }
public String toString() { return this.getClass().getName() + ": " +
identifier;}
@@ -360,6 +360,10 @@
return k.identifier == this.identifier;
}
return false;
+ }
+
+ protected static String justTheId(String str) {
+ return str.substring(str.indexOf(':') + 1);
}
}
Modified:
incubator/jdo/trunk/tck11/test/java/org/apache/jdo/tck/pc/fieldtypes/HashtableStringKeyCollections.java
URL:
http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck11/test/java/org/apache/jdo/tck/pc/fieldtypes/HashtableStringKeyCollections.java?view=diff&r1=159661&r2=159662
==============================================================================
---
incubator/jdo/trunk/tck11/test/java/org/apache/jdo/tck/pc/fieldtypes/HashtableStringKeyCollections.java
(original)
+++
incubator/jdo/trunk/tck11/test/java/org/apache/jdo/tck/pc/fieldtypes/HashtableStringKeyCollections.java
Thu Mar 31 20:42:49 2005
@@ -936,7 +936,7 @@
public Oid() {
}
- public Oid(String s) { identifier = Integer.parseInt(s); }
+ public Oid(String s) { identifier = Integer.parseInt(justTheId(s)); }
public String toString() { return this.getClass().getName() + ": " +
identifier;}
@@ -948,6 +948,10 @@
return k.identifier == this.identifier;
}
return false;
+ }
+
+ protected static String justTheId(String str) {
+ return str.substring(str.indexOf(':') + 1);
}
}
Modified:
incubator/jdo/trunk/tck11/test/java/org/apache/jdo/tck/pc/fieldtypes/HashtableStringValueCollections.java
URL:
http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck11/test/java/org/apache/jdo/tck/pc/fieldtypes/HashtableStringValueCollections.java?view=diff&r1=159661&r2=159662
==============================================================================
---
incubator/jdo/trunk/tck11/test/java/org/apache/jdo/tck/pc/fieldtypes/HashtableStringValueCollections.java
(original)
+++
incubator/jdo/trunk/tck11/test/java/org/apache/jdo/tck/pc/fieldtypes/HashtableStringValueCollections.java
Thu Mar 31 20:42:49 2005
@@ -873,7 +873,7 @@
public Oid() {
}
- public Oid(String s) { identifier = Integer.parseInt(s); }
+ public Oid(String s) { identifier = Integer.parseInt(justTheId(s)); }
public String toString() { return this.getClass().getName() + ": " +
identifier;}
@@ -885,6 +885,10 @@
return k.identifier == this.identifier;
}
return false;
+ }
+
+ protected static String justTheId(String str) {
+ return str.substring(str.indexOf(':') + 1);
}
}
Modified:
incubator/jdo/trunk/tck11/test/java/org/apache/jdo/tck/pc/fieldtypes/LinkedListCollections.java
URL:
http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck11/test/java/org/apache/jdo/tck/pc/fieldtypes/LinkedListCollections.java?view=diff&r1=159661&r2=159662
==============================================================================
---
incubator/jdo/trunk/tck11/test/java/org/apache/jdo/tck/pc/fieldtypes/LinkedListCollections.java
(original)
+++
incubator/jdo/trunk/tck11/test/java/org/apache/jdo/tck/pc/fieldtypes/LinkedListCollections.java
Thu Mar 31 20:42:49 2005
@@ -348,7 +348,7 @@
public Oid() {
}
- public Oid(String s) { identifier = Integer.parseInt(s); }
+ public Oid(String s) { identifier = Integer.parseInt(justTheId(s)); }
public String toString() { return this.getClass().getName() + ": " +
identifier;}
@@ -361,6 +361,9 @@
}
return false;
}
-
+
+ protected static String justTheId(String str) {
+ return str.substring(str.indexOf(':') + 1);
+ }
}
}
Modified:
incubator/jdo/trunk/tck11/test/java/org/apache/jdo/tck/pc/fieldtypes/ListCollections.java
URL:
http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck11/test/java/org/apache/jdo/tck/pc/fieldtypes/ListCollections.java?view=diff&r1=159661&r2=159662
==============================================================================
---
incubator/jdo/trunk/tck11/test/java/org/apache/jdo/tck/pc/fieldtypes/ListCollections.java
(original)
+++
incubator/jdo/trunk/tck11/test/java/org/apache/jdo/tck/pc/fieldtypes/ListCollections.java
Thu Mar 31 20:42:49 2005
@@ -348,7 +348,7 @@
public Oid() {
}
- public Oid(String s) { identifier = Integer.parseInt(s); }
+ public Oid(String s) { identifier = Integer.parseInt(justTheId(s)); }
public String toString() { return this.getClass().getName() + ": " +
identifier;}
@@ -360,6 +360,10 @@
return k.identifier == this.identifier;
}
return false;
+ }
+
+ protected static String justTheId(String str) {
+ return str.substring(str.indexOf(':') + 1);
}
}
Modified:
incubator/jdo/trunk/tck11/test/java/org/apache/jdo/tck/pc/fieldtypes/MapStringKeyCollections.java
URL:
http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck11/test/java/org/apache/jdo/tck/pc/fieldtypes/MapStringKeyCollections.java?view=diff&r1=159661&r2=159662
==============================================================================
---
incubator/jdo/trunk/tck11/test/java/org/apache/jdo/tck/pc/fieldtypes/MapStringKeyCollections.java
(original)
+++
incubator/jdo/trunk/tck11/test/java/org/apache/jdo/tck/pc/fieldtypes/MapStringKeyCollections.java
Thu Mar 31 20:42:49 2005
@@ -936,7 +936,7 @@
public Oid() {
}
- public Oid(String s) { identifier = Integer.parseInt(s); }
+ public Oid(String s) { identifier = Integer.parseInt(justTheId(s)); }
public String toString() { return this.getClass().getName() + ": " +
identifier;}
@@ -948,6 +948,10 @@
return k.identifier == this.identifier;
}
return false;
+ }
+
+ protected static String justTheId(String str) {
+ return str.substring(str.indexOf(':') + 1);
}
}
Modified:
incubator/jdo/trunk/tck11/test/java/org/apache/jdo/tck/pc/fieldtypes/MapStringValueCollections.java
URL:
http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck11/test/java/org/apache/jdo/tck/pc/fieldtypes/MapStringValueCollections.java?view=diff&r1=159661&r2=159662
==============================================================================
---
incubator/jdo/trunk/tck11/test/java/org/apache/jdo/tck/pc/fieldtypes/MapStringValueCollections.java
(original)
+++
incubator/jdo/trunk/tck11/test/java/org/apache/jdo/tck/pc/fieldtypes/MapStringValueCollections.java
Thu Mar 31 20:42:49 2005
@@ -873,7 +873,7 @@
public Oid() {
}
- public Oid(String s) { identifier = Integer.parseInt(s); }
+ public Oid(String s) { identifier = Integer.parseInt(justTheId(s)); }
public String toString() { return this.getClass().getName() + ": " +
identifier;}
@@ -885,6 +885,10 @@
return k.identifier == this.identifier;
}
return false;
+ }
+
+ protected static String justTheId(String str) {
+ return str.substring(str.indexOf(':') + 1);
}
}
Modified:
incubator/jdo/trunk/tck11/test/java/org/apache/jdo/tck/pc/fieldtypes/SetCollections.java
URL:
http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck11/test/java/org/apache/jdo/tck/pc/fieldtypes/SetCollections.java?view=diff&r1=159661&r2=159662
==============================================================================
---
incubator/jdo/trunk/tck11/test/java/org/apache/jdo/tck/pc/fieldtypes/SetCollections.java
(original)
+++
incubator/jdo/trunk/tck11/test/java/org/apache/jdo/tck/pc/fieldtypes/SetCollections.java
Thu Mar 31 20:42:49 2005
@@ -348,7 +348,7 @@
public Oid() {
}
- public Oid(String s) { identifier = Integer.parseInt(s); }
+ public Oid(String s) { identifier = Integer.parseInt(justTheId(s)); }
public String toString() { return this.getClass().getName() + ": " +
identifier;}
@@ -360,6 +360,10 @@
return k.identifier == this.identifier;
}
return false;
+ }
+
+ protected static String justTheId(String str) {
+ return str.substring(str.indexOf(':') + 1);
}
}
Modified:
incubator/jdo/trunk/tck11/test/java/org/apache/jdo/tck/pc/fieldtypes/SimpleClass.java
URL:
http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck11/test/java/org/apache/jdo/tck/pc/fieldtypes/SimpleClass.java?view=diff&r1=159661&r2=159662
==============================================================================
---
incubator/jdo/trunk/tck11/test/java/org/apache/jdo/tck/pc/fieldtypes/SimpleClass.java
(original)
+++
incubator/jdo/trunk/tck11/test/java/org/apache/jdo/tck/pc/fieldtypes/SimpleClass.java
Thu Mar 31 20:42:49 2005
@@ -90,7 +90,7 @@
public Oid() {
}
- public Oid(String s) { id = Long.parseLong(s); }
+ public Oid(String s) { id = Integer.parseInt(justTheId(s)); }
public String toString() { return this.getClass().getName() + ": " +
id;}
@@ -102,6 +102,10 @@
return k.id == this.id;
}
return false;
+ }
+
+ protected static String justTheId(String str) {
+ return str.substring(str.indexOf(':') + 1);
}
public int compareTo(Object p){
Modified:
incubator/jdo/trunk/tck11/test/java/org/apache/jdo/tck/pc/fieldtypes/TreeMapStringKeyCollections.java
URL:
http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck11/test/java/org/apache/jdo/tck/pc/fieldtypes/TreeMapStringKeyCollections.java?view=diff&r1=159661&r2=159662
==============================================================================
---
incubator/jdo/trunk/tck11/test/java/org/apache/jdo/tck/pc/fieldtypes/TreeMapStringKeyCollections.java
(original)
+++
incubator/jdo/trunk/tck11/test/java/org/apache/jdo/tck/pc/fieldtypes/TreeMapStringKeyCollections.java
Thu Mar 31 20:42:49 2005
@@ -936,7 +936,7 @@
public Oid() {
}
- public Oid(String s) { identifier = Integer.parseInt(s); }
+ public Oid(String s) { identifier = Integer.parseInt(justTheId(s)); }
public String toString() { return this.getClass().getName() + ": " +
identifier;}
@@ -949,6 +949,9 @@
}
return false;
}
-
+
+ protected static String justTheId(String str) {
+ return str.substring(str.indexOf(':') + 1);
+ }
}
}
Modified:
incubator/jdo/trunk/tck11/test/java/org/apache/jdo/tck/pc/fieldtypes/TreeMapStringValueCollections.java
URL:
http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck11/test/java/org/apache/jdo/tck/pc/fieldtypes/TreeMapStringValueCollections.java?view=diff&r1=159661&r2=159662
==============================================================================
---
incubator/jdo/trunk/tck11/test/java/org/apache/jdo/tck/pc/fieldtypes/TreeMapStringValueCollections.java
(original)
+++
incubator/jdo/trunk/tck11/test/java/org/apache/jdo/tck/pc/fieldtypes/TreeMapStringValueCollections.java
Thu Mar 31 20:42:49 2005
@@ -873,7 +873,7 @@
public Oid() {
}
- public Oid(String s) { identifier = Integer.parseInt(s); }
+ public Oid(String s) { identifier = Integer.parseInt(justTheId(s)); }
public String toString() { return this.getClass().getName() + ": " +
identifier;}
@@ -885,6 +885,10 @@
return k.identifier == this.identifier;
}
return false;
+ }
+
+ protected static String justTheId(String str) {
+ return str.substring(str.indexOf(':') + 1);
}
}
Modified:
incubator/jdo/trunk/tck11/test/java/org/apache/jdo/tck/pc/fieldtypes/TreeSetCollections.java
URL:
http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck11/test/java/org/apache/jdo/tck/pc/fieldtypes/TreeSetCollections.java?view=diff&r1=159661&r2=159662
==============================================================================
---
incubator/jdo/trunk/tck11/test/java/org/apache/jdo/tck/pc/fieldtypes/TreeSetCollections.java
(original)
+++
incubator/jdo/trunk/tck11/test/java/org/apache/jdo/tck/pc/fieldtypes/TreeSetCollections.java
Thu Mar 31 20:42:49 2005
@@ -327,7 +327,7 @@
public Oid() {
}
- public Oid(String s) { identifier = Integer.parseInt(s); }
+ public Oid(String s) { identifier = Integer.parseInt(justTheId(s)); }
public String toString() { return this.getClass().getName() + ": " +
identifier;}
@@ -339,6 +339,10 @@
return k.identifier == this.identifier;
}
return false;
+ }
+
+ protected static String justTheId(String str) {
+ return str.substring(str.indexOf(':') + 1);
}
}
Modified:
incubator/jdo/trunk/tck11/test/java/org/apache/jdo/tck/pc/fieldtypes/VectorCollections.java
URL:
http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck11/test/java/org/apache/jdo/tck/pc/fieldtypes/VectorCollections.java?view=diff&r1=159661&r2=159662
==============================================================================
---
incubator/jdo/trunk/tck11/test/java/org/apache/jdo/tck/pc/fieldtypes/VectorCollections.java
(original)
+++
incubator/jdo/trunk/tck11/test/java/org/apache/jdo/tck/pc/fieldtypes/VectorCollections.java
Thu Mar 31 20:42:49 2005
@@ -348,7 +348,7 @@
public Oid() {
}
- public Oid(String s) { identifier = Integer.parseInt(s); }
+ public Oid(String s) { identifier = Integer.parseInt(justTheId(s)); }
public String toString() { return this.getClass().getName() + ": " +
identifier;}
@@ -360,6 +360,10 @@
return k.identifier == this.identifier;
}
return false;
+ }
+
+ protected static String justTheId(String str) {
+ return str.substring(str.indexOf(':') + 1);
}
}
Modified:
incubator/jdo/trunk/tck11/test/java/org/apache/jdo/tck/pc/mylib/PCPoint.java
URL:
http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck11/test/java/org/apache/jdo/tck/pc/mylib/PCPoint.java?view=diff&r1=159661&r2=159662
==============================================================================
---
incubator/jdo/trunk/tck11/test/java/org/apache/jdo/tck/pc/mylib/PCPoint.java
(original)
+++
incubator/jdo/trunk/tck11/test/java/org/apache/jdo/tck/pc/mylib/PCPoint.java
Thu Mar 31 20:42:49 2005
@@ -85,12 +85,16 @@
public static class Oid implements Serializable {
public long id;
+ /** The name of the class of the target object.
+ */
+ public static String targetClassName =
"org.apache.jdo.tck.pc.mylib.PCPoint";
+
public Oid() {
}
- public Oid(String s) { id = Long.parseLong(s); }
+ public Oid(String s) { id = Long.parseLong(justTheId(s)); }
- public String toString() { return this.getClass().getName() + ": " +
id;}
+ public String toString() { return getTargetClassName() + ": " + id;}
public int hashCode() { return (int)id ; }
@@ -101,6 +105,17 @@
}
return false;
}
+
+ protected static String justTheId(String str) {
+ return str.substring(str.indexOf(':') + 1);
+ }
+
+ /** Return the target class name.
+ * @return the target class name.
+ */
+ public String getTargetClassName() {
+ return targetClassName;
+ }
}
}
Modified:
incubator/jdo/trunk/tck11/test/java/org/apache/jdo/tck/pc/mylib/PCPoint2.java
URL:
http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck11/test/java/org/apache/jdo/tck/pc/mylib/PCPoint2.java?view=diff&r1=159661&r2=159662
==============================================================================
---
incubator/jdo/trunk/tck11/test/java/org/apache/jdo/tck/pc/mylib/PCPoint2.java
(original)
+++
incubator/jdo/trunk/tck11/test/java/org/apache/jdo/tck/pc/mylib/PCPoint2.java
Thu Mar 31 20:42:49 2005
@@ -126,7 +126,7 @@
public Oid() {
}
- public Oid(String s) { id = Long.parseLong(s); }
+ public Oid(String s) { id = Long.parseLong(justTheId(s)); }
public String toString() { return this.getClass().getName() + ": " +
id;}
@@ -138,6 +138,10 @@
return k.id == this.id;
}
return false;
+ }
+
+ protected static String justTheId(String str) {
+ return str.substring(str.indexOf(':') + 1);
}
}
Modified:
incubator/jdo/trunk/tck11/test/java/org/apache/jdo/tck/pc/mylib/PCRect.java
URL:
http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck11/test/java/org/apache/jdo/tck/pc/mylib/PCRect.java?view=diff&r1=159661&r2=159662
==============================================================================
--- incubator/jdo/trunk/tck11/test/java/org/apache/jdo/tck/pc/mylib/PCRect.java
(original)
+++ incubator/jdo/trunk/tck11/test/java/org/apache/jdo/tck/pc/mylib/PCRect.java
Thu Mar 31 20:42:49 2005
@@ -82,7 +82,7 @@
public Oid() {
}
- public Oid(String s) { id = Long.parseLong(s); }
+ public Oid(String s) { id = Long.parseLong(justTheId(s)); }
public String toString() { return this.getClass().getName() + ": " +
id;}
@@ -94,6 +94,10 @@
return k.id == this.id;
}
return false;
+ }
+
+ protected static String justTheId(String str) {
+ return str.substring(str.indexOf(':') + 1);
}
}
Modified:
incubator/jdo/trunk/tck11/test/java/org/apache/jdo/tck/pc/mylib/PrimitiveTypes.java
URL:
http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck11/test/java/org/apache/jdo/tck/pc/mylib/PrimitiveTypes.java?view=diff&r1=159661&r2=159662
==============================================================================
---
incubator/jdo/trunk/tck11/test/java/org/apache/jdo/tck/pc/mylib/PrimitiveTypes.java
(original)
+++
incubator/jdo/trunk/tck11/test/java/org/apache/jdo/tck/pc/mylib/PrimitiveTypes.java
Thu Mar 31 20:42:49 2005
@@ -294,18 +294,22 @@
public Oid() {
}
- public boolean equals(java.lang.Object obj) {
- if( obj==null ||
- !this.getClass().equals(obj.getClass()) ) return( false );
- Oid o=(Oid) obj;
- if( this.id!=o.id ) return( false );
- return( true );
- }
+ public Oid(String s) { id = Long.parseLong(justTheId(s)); }
+
+ public String toString() { return this.getClass().getName() + ": " +
id;}
- public int hashCode() {
- int hashCode=0;
- hashCode += id;
- return( hashCode );
+ public int hashCode() { return (int)id ; }
+
+ public boolean equals(Object other) {
+ if (other != null && (other instanceof Oid)) {
+ Oid k = (Oid)other;
+ return k.id == this.id;
+ }
+ return false;
+ }
+
+ protected static String justTheId(String str) {
+ return str.substring(str.indexOf(':') + 1);
}
public int compareTo(Object o) {
