You are viewing a plain text version of this content. The canonical link for it is here.
Posted to jdo-commits@db.apache.org by cl...@apache.org on 2006/01/20 01:17:58 UTC
svn commit: r370679 - in /db/jdo/trunk/tck20/src/java/org/apache/jdo/tck:
api/persistencemanagerfactory/ models/fieldtypes/
Author: clr
Date: Thu Jan 19 16:17:51 2006
New Revision: 370679
URL: http://svn.apache.org/viewcvs?rev=370679&view=rev
Log:
JDO-281 fix JDK 1.5 issues
Modified:
db/jdo/trunk/tck20/src/java/org/apache/jdo/tck/api/persistencemanagerfactory/AfterCloseSetMethodsThrowException.java
db/jdo/trunk/tck20/src/java/org/apache/jdo/tck/api/persistencemanagerfactory/AfterGetPersistenceManagerNoSetMethodsSucceed.java
db/jdo/trunk/tck20/src/java/org/apache/jdo/tck/models/fieldtypes/TestArrayCollections.java
db/jdo/trunk/tck20/src/java/org/apache/jdo/tck/models/fieldtypes/TestArrayListCollections.java
db/jdo/trunk/tck20/src/java/org/apache/jdo/tck/models/fieldtypes/TestCollectionCollections.java
Modified: db/jdo/trunk/tck20/src/java/org/apache/jdo/tck/api/persistencemanagerfactory/AfterCloseSetMethodsThrowException.java
URL: http://svn.apache.org/viewcvs/db/jdo/trunk/tck20/src/java/org/apache/jdo/tck/api/persistencemanagerfactory/AfterCloseSetMethodsThrowException.java?rev=370679&r1=370678&r2=370679&view=diff
==============================================================================
--- db/jdo/trunk/tck20/src/java/org/apache/jdo/tck/api/persistencemanagerfactory/AfterCloseSetMethodsThrowException.java (original)
+++ db/jdo/trunk/tck20/src/java/org/apache/jdo/tck/api/persistencemanagerfactory/AfterCloseSetMethodsThrowException.java Thu Jan 19 16:17:51 2006
@@ -174,14 +174,15 @@
GetProperty(String methodName) {
this.methodName = methodName;
try {
- method = PersistenceManagerFactory.class.getMethod(methodName, null);
+ method = PersistenceManagerFactory.class.getMethod(methodName,
+ (Class[])null);
} catch (NoSuchMethodException ex) {
throw new JDOFatalInternalException("Method not defined: " + methodName);
}
}
void execute(PersistenceManagerFactory pmf) {
try {
- method.invoke(pmf, null);
+ method.invoke(pmf, (Object[])null);
} catch (IllegalAccessException ex) {
throw new JDOFatalInternalException("IllegalAccessException", ex);
} catch (java.lang.reflect.InvocationTargetException ex) {
Modified: db/jdo/trunk/tck20/src/java/org/apache/jdo/tck/api/persistencemanagerfactory/AfterGetPersistenceManagerNoSetMethodsSucceed.java
URL: http://svn.apache.org/viewcvs/db/jdo/trunk/tck20/src/java/org/apache/jdo/tck/api/persistencemanagerfactory/AfterGetPersistenceManagerNoSetMethodsSucceed.java?rev=370679&r1=370678&r2=370679&view=diff
==============================================================================
--- db/jdo/trunk/tck20/src/java/org/apache/jdo/tck/api/persistencemanagerfactory/AfterGetPersistenceManagerNoSetMethodsSucceed.java (original)
+++ db/jdo/trunk/tck20/src/java/org/apache/jdo/tck/api/persistencemanagerfactory/AfterGetPersistenceManagerNoSetMethodsSucceed.java Thu Jan 19 16:17:51 2006
@@ -207,7 +207,8 @@
GetProperty(String methodName) {
this.methodName = methodName;
try {
- method = PersistenceManagerFactory.class.getMethod(methodName, null);
+ method = PersistenceManagerFactory.class.getMethod(methodName,
+ (Class[])null);
} catch (NoSuchMethodException ex) {
throw new JDOFatalInternalException(
"Method not defined: " + methodName);
@@ -215,7 +216,7 @@
}
void execute(PersistenceManagerFactory pmf) {
try {
- method.invoke(pmf, null);
+ method.invoke(pmf, (Object[])null);
} catch (IllegalAccessException ex) {
throw new JDOFatalInternalException("IllegalAccessException", ex);
} catch (java.lang.reflect.InvocationTargetException ex) {
Modified: db/jdo/trunk/tck20/src/java/org/apache/jdo/tck/models/fieldtypes/TestArrayCollections.java
URL: http://svn.apache.org/viewcvs/db/jdo/trunk/tck20/src/java/org/apache/jdo/tck/models/fieldtypes/TestArrayCollections.java?rev=370679&r1=370678&r2=370679&view=diff
==============================================================================
--- db/jdo/trunk/tck20/src/java/org/apache/jdo/tck/models/fieldtypes/TestArrayCollections.java (original)
+++ db/jdo/trunk/tck20/src/java/org/apache/jdo/tck/models/fieldtypes/TestArrayCollections.java Thu Jan 19 16:17:51 2006
@@ -176,7 +176,7 @@
).equals("BigDecimal")) {
for (int j = 0; j < actual.length; ++j) {
BigDecimal expectedBD = (BigDecimal)expected[j];
- Object actualBD = (BigDecimal)actual[j];
+ BigDecimal actualBD = (BigDecimal)actual[j];
if ((expectedBD.compareTo(actualBD) != 0)) {
sbuf.append("\nFor element " + i + "[" + j +
"], expected = " + expectedBD +
Modified: db/jdo/trunk/tck20/src/java/org/apache/jdo/tck/models/fieldtypes/TestArrayListCollections.java
URL: http://svn.apache.org/viewcvs/db/jdo/trunk/tck20/src/java/org/apache/jdo/tck/models/fieldtypes/TestArrayListCollections.java?rev=370679&r1=370678&r2=370679&view=diff
==============================================================================
--- db/jdo/trunk/tck20/src/java/org/apache/jdo/tck/models/fieldtypes/TestArrayListCollections.java (original)
+++ db/jdo/trunk/tck20/src/java/org/apache/jdo/tck/models/fieldtypes/TestArrayListCollections.java Thu Jan 19 16:17:51 2006
@@ -171,7 +171,7 @@
for (int j = 0; j < actualL.size(); ++j) {
BigDecimal bigDecCompareWith =
(BigDecimal)expectedL.get(j);
- Object bigDecVal = actualL.get(j);
+ BigDecimal bigDecVal = (BigDecimal)actualL.get(j);
if ((bigDecCompareWith.compareTo(bigDecVal) != 0)) {
sbuf.append("\nFor element " + i + "(" + j +
"), expected = " + expected +
Modified: db/jdo/trunk/tck20/src/java/org/apache/jdo/tck/models/fieldtypes/TestCollectionCollections.java
URL: http://svn.apache.org/viewcvs/db/jdo/trunk/tck20/src/java/org/apache/jdo/tck/models/fieldtypes/TestCollectionCollections.java?rev=370679&r1=370678&r2=370679&view=diff
==============================================================================
--- db/jdo/trunk/tck20/src/java/org/apache/jdo/tck/models/fieldtypes/TestCollectionCollections.java (original)
+++ db/jdo/trunk/tck20/src/java/org/apache/jdo/tck/models/fieldtypes/TestCollectionCollections.java Thu Jan 19 16:17:51 2006
@@ -161,7 +161,7 @@
for (int j = 0; j < actualL.size(); ++j) {
BigDecimal bigDecCompareWith =
(BigDecimal)expectedL.get(j);
- Object bigDecVal = actualL.get(j);
+ BigDecimal bigDecVal = (BigDecimal)actualL.get(j);
if ((bigDecCompareWith.compareTo(bigDecVal) != 0)) {
sbuf.append("\nFor element " + i + "(" + j +
"), expected = " + expected +