cayenne-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From amania...@apache.org
Subject svn commit: r600160 [1/3] - in /cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src: main/java/org/apache/cayenne/ main/java/org/apache/cayenne/access/ main/java/org/apache/cayenne/access/jdbc/ main/java/org/apache/cayenne/access/trans/ main/ja...
Date Sat, 01 Dec 2007 16:42:12 GMT
Author: amaniatis
Date: Sat Dec  1 08:42:05 2007
New Revision: 600160

URL: http://svn.apache.org/viewvc?rev=600160&view=rev
Log:
Removing casts and imports now not needed after generics applied.

Modified:
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/ObjectContextChangeLog.java
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/DataContext.java
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/DataDomainDBDiffBuilder.java
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/DataDomainQueryAction.java
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/DataDomainSyncBucket.java
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/DataNodeSyncQualifierDescriptor.java
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/DataRowUtils.java
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/PrefetchProcessorJointNode.java
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/jdbc/EJBQLConditionTranslator.java
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/jdbc/EJBQLFromTranslator.java
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/jdbc/EJBQLIdentifierColumnsTranslator.java
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/jdbc/EJBQLPathTranslator.java
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/trans/QueryAssembler.java
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/trans/QueryAssemblerHelper.java
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/trans/SelectTranslator.java
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/types/DefaultType.java
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/openbase/OpenBaseAdapter.java
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/oracle/OracleProcedureAction.java
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/sqlserver/SQLServerMergerFactory.java
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/ejbql/parser/SimpleNode.java
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/project/validator/ObjRelationshipValidator.java
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/tools/CayenneGenerator.java
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/tools/DataPortTask.java
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/tools/DbGeneratorTask.java
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/tools/DeploymentConfigurator.java
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/wocompat/EOQuery.java
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/wocompat/parser/ParserTokenManager.java
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/xml/XMLDecoder.java
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/CDOCollectionRelationshipTest.java
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/CDOMapRelationshipTest.java
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/CDOOneToManyFKTest.java
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/CDOOneToOneFKTest.java
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/CDOSetRelationshipTest.java
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/CayenneContextClientChannelEventsTest.java
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/CayenneContextDeleteRulesTest.java
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/CayenneContextMapRelationshipTest.java
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/CayenneContextMergeHandlerTest.java
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/CayenneContextValidationTest.java
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/CayenneContextWithDataContextTest.java
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/CayenneDataObjectFlattenedRelTest.java
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/CayenneDataObjectInCtxtTest.java
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/CayenneDataObjectRelTest.java
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/CayenneDataObjectValidationTest.java
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/CompoundPkChangeTest.java
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/FlattenedRelationshipsTest.java
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/GeneratedMethodsInClientObjectContextTest.java
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/MeaningfulFKTest.java
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/PersistenceByReachabilityTest.java
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/PregeneratedPKTest.java
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextCallbacksTest.java
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextCommitTest.java
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextCompoundRelTest.java
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextCrossDBTest.java
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextDataChannelEventsTest.java
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextDecoratedStackTest.java
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextDeleteRulesTest.java
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextEJBQLFunctionalExpressions.java
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextEJBQLQueryTest.java
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextEJBQLUpdateTest.java
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextExtrasTest.java
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextPerformQueryAPITest.java
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextPrefetchTest.java
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextQueryChainTest.java
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextSQLTemplateTest.java
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextSerializationTest.java
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextSharedCacheEmpiricTest.java
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextTest.java
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextValidationTest.java
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataDomainCallbacksTest.java
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataRowUtilsTest.java
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DateTimeTypesTest.java
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DbLoaderTest.java
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DeleteObjectTest.java
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DeleteRulesTest.java
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/IdentityColumnsTest.java
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/InheritanceTest.java
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/NestedDataContextParentEventsTest.java
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/NestedDataContextParentPeerEventsTest.java
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/NestedDataContextPeerEventsTest.java
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/NestedDataContextReadTest.java
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/NestedDataContextValidationTest.java
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/NestedDataContextWriteTest.java
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/NumericTypesTest.java
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/ObjectStoreDiffRetainingTest.java
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/ObjectStoreGCTest.java
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/ObjectStoreTest.java
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/OptimisticLockingTest.java
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/PrimitiveAttributesTest.java
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/RefreshQueryInContextTest.java
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/ToManyListTest.java
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/TransactionThreadTest.java
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/UserTransactionTest.java
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/dba/PkGeneratorTest.java
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/map/MapLoaderLoadTest.java
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/merge/MergerFactoryTest.java
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/project/DataMapProjectTest.java
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/query/SelectQueryBasicsTest.java
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/CayenneCase.java
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/SimpleAccessStack.java
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/TestDataDomainTest.java
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/jira/CAY_191Test.java
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/jira/CAY_194Test.java
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/jira/CAY_901Test.java
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/util/DeepMergeOperationInheritanceTest.java
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/util/DeepMergeOperationTest.java

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/ObjectContextChangeLog.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/ObjectContextChangeLog.java?rev=600160&r1=600159&r2=600160&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/ObjectContextChangeLog.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/ObjectContextChangeLog.java Sat Dec  1 08:42:05 2007
@@ -91,7 +91,7 @@
     }
 
     GraphDiff getDiffsAfterMarker(String markerTag) {
-        Integer pos = (Integer) markers.get(markerTag);
+        Integer pos = markers.get(markerTag);
         int marker = (pos == null) ? -1 : pos.intValue();
         if (marker < 0) {
             throw new IllegalStateException("No marked position for tag '"
@@ -122,7 +122,7 @@
     }
 
     int sizeAfterMarker(String markerTag) {
-        Integer pos = (Integer) markers.get(markerTag);
+        Integer pos = markers.get(markerTag);
         int marker = (pos == null) ? -1 : pos.intValue();
         if (marker < 0) {
             throw new IllegalStateException("No marked position for tag '"

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/DataContext.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/DataContext.java?rev=600160&r1=600159&r2=600160&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/DataContext.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/DataContext.java Sat Dec  1 08:42:05 2007
@@ -601,7 +601,7 @@
                     return true;
                 }
 
-                DbRelationship dbRel = (DbRelationship) rel.getDbRelationships().get(0);
+                DbRelationship dbRel = rel.getDbRelationships().get(0);
                 Map fk = dbRel.srcFkSnapshotWithTargetSnapshot(idParts);
                 snapshot.putAll(fk);
                 return true;

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/DataDomainDBDiffBuilder.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/DataDomainDBDiffBuilder.java?rev=600160&r1=600159&r2=600160&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/DataDomainDBDiffBuilder.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/DataDomainDBDiffBuilder.java Sat Dec  1 08:42:05 2007
@@ -118,7 +118,7 @@
                 ObjRelationship relation = (ObjRelationship) objEntity
                         .getRelationship(entry.getKey().toString());
 
-                DbRelationship dbRelation = (DbRelationship) relation
+                DbRelationship dbRelation = relation
                         .getDbRelationships()
                         .get(0);
 

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/DataDomainQueryAction.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/DataDomainQueryAction.java?rev=600160&r1=600159&r2=600160&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/DataDomainQueryAction.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/DataDomainQueryAction.java Sat Dec  1 08:42:05 2007
@@ -225,7 +225,7 @@
             // we can assume that there is one and only one DbRelationship as
             // we previously checked that
             // "!isSourceIndependentFromTargetChange"
-            DbRelationship dbRelationship = (DbRelationship) relationship
+            DbRelationship dbRelationship = relationship
                     .getDbRelationships()
                     .get(0);
 

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/DataDomainSyncBucket.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/DataDomainSyncBucket.java?rev=600160&r1=600159&r2=600160&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/DataDomainSyncBucket.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/DataDomainSyncBucket.java Sat Dec  1 08:42:05 2007
@@ -29,7 +29,6 @@
 import org.apache.cayenne.CayenneRuntimeException;
 import org.apache.cayenne.DataObject;
 import org.apache.cayenne.DataRow;
-import org.apache.cayenne.Fault;
 import org.apache.cayenne.ObjectId;
 import org.apache.cayenne.Persistent;
 import org.apache.cayenne.graph.CompoundDiff;

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/DataNodeSyncQualifierDescriptor.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/DataNodeSyncQualifierDescriptor.java?rev=600160&r1=600159&r2=600160&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/DataNodeSyncQualifierDescriptor.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/DataNodeSyncQualifierDescriptor.java Sat Dec  1 08:42:05 2007
@@ -152,7 +152,7 @@
 
                 if (relationship.isUsedForLocking()) {
                     // only care about the first DbRelationship
-                    DbRelationship dbRelationship = (DbRelationship) relationship
+                    DbRelationship dbRelationship = relationship
                             .getDbRelationships()
                             .get(0);
 

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/DataRowUtils.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/DataRowUtils.java?rev=600160&r1=600159&r2=600160&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/DataRowUtils.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/DataRowUtils.java Sat Dec  1 08:42:05 2007
@@ -177,7 +177,7 @@
                     // otherwise leave it alone
                     if (!isToOneTargetModified(property, object, diff)) {
 
-                        DbRelationship dbRelationship = (DbRelationship) relationship
+                        DbRelationship dbRelationship = relationship
                                 .getDbRelationships()
                                 .get(0);
 

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/PrefetchProcessorJointNode.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/PrefetchProcessorJointNode.java?rev=600160&r1=600159&r2=600160&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/PrefetchProcessorJointNode.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/PrefetchProcessorJointNode.java Sat Dec  1 08:42:05 2007
@@ -173,7 +173,7 @@
                 && getIncoming() != null
                 && !getIncoming().getRelationship().isFlattened()) {
 
-            DbRelationship r = (DbRelationship) getIncoming()
+            DbRelationship r = getIncoming()
                     .getRelationship()
                     .getDbRelationships()
                     .get(0);
@@ -214,7 +214,7 @@
         Iterator relationships = getResolver().getEntity().getRelationships().iterator();
         while (relationships.hasNext()) {
             ObjRelationship rel = (ObjRelationship) relationships.next();
-            DbRelationship dbRel = (DbRelationship) rel.getDbRelationships().get(0);
+            DbRelationship dbRel = rel.getDbRelationships().get(0);
             Iterator dbAttributes = dbRel.getSourceAttributes().iterator();
 
             while (dbAttributes.hasNext()) {

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/jdbc/EJBQLConditionTranslator.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/jdbc/EJBQLConditionTranslator.java?rev=600160&r1=600159&r2=600160&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/jdbc/EJBQLConditionTranslator.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/jdbc/EJBQLConditionTranslator.java Sat Dec  1 08:42:05 2007
@@ -168,7 +168,7 @@
 
         ObjRelationship relationship = context.getIncomingRelationship(id);
         // TODO: andrus, 8/11/2007 flattened?
-        DbRelationship correlatedJoinRelationship = (DbRelationship) relationship
+        DbRelationship correlatedJoinRelationship = relationship
                 .getDbRelationships()
                 .get(0);
         Iterator it = correlatedJoinRelationship.getJoins().iterator();
@@ -247,7 +247,7 @@
 
         ObjRelationship relationship = context.getIncomingRelationship(id);
         // TODO: andrus, 8/11/2007 flattened?
-        DbRelationship correlatedJoinRelationship = (DbRelationship) relationship
+        DbRelationship correlatedJoinRelationship = relationship
                 .getDbRelationships()
                 .get(0);
         Iterator it = correlatedJoinRelationship.getJoins().iterator();

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/jdbc/EJBQLFromTranslator.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/jdbc/EJBQLFromTranslator.java?rev=600160&r1=600159&r2=600160&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/jdbc/EJBQLFromTranslator.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/jdbc/EJBQLFromTranslator.java Sat Dec  1 08:42:05 2007
@@ -102,7 +102,7 @@
         }
 
         // TODO: andrus, 4/8/2007 - support for flattened relationships
-        DbRelationship incomingDB = (DbRelationship) joinRelationship
+        DbRelationship incomingDB = joinRelationship
                 .getDbRelationships()
                 .get(0);
 

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/jdbc/EJBQLIdentifierColumnsTranslator.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/jdbc/EJBQLIdentifierColumnsTranslator.java?rev=600160&r1=600159&r2=600160&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/jdbc/EJBQLIdentifierColumnsTranslator.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/jdbc/EJBQLIdentifierColumnsTranslator.java Sat Dec  1 08:42:05 2007
@@ -98,7 +98,7 @@
 
             private void visitRelationship(ArcProperty property) {
                 ObjRelationship rel = property.getRelationship();
-                DbRelationship dbRel = (DbRelationship) rel.getDbRelationships().get(0);
+                DbRelationship dbRel = rel.getDbRelationships().get(0);
 
                 List joins = dbRel.getJoins();
                 int len = joins.size();

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/jdbc/EJBQLPathTranslator.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/jdbc/EJBQLPathTranslator.java?rev=600160&r1=600159&r2=600160&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/jdbc/EJBQLPathTranslator.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/jdbc/EJBQLPathTranslator.java Sat Dec  1 08:42:05 2007
@@ -236,7 +236,7 @@
             resolveJoin(false);
 
             // TODO: andrus, 6/21/2007 - flattened support
-            DbRelationship dbRelationship = (DbRelationship) relationship
+            DbRelationship dbRelationship = relationship
                     .getDbRelationships()
                     .get(0);
             DbEntity table = (DbEntity) dbRelationship.getTargetEntity();
@@ -264,7 +264,7 @@
             // match FK against the target object
 
             // TODO: andrus, 6/21/2007 - flattened support
-            DbRelationship dbRelationship = (DbRelationship) relationship
+            DbRelationship dbRelationship = relationship
                     .getDbRelationships()
                     .get(0);
             DbEntity table = (DbEntity) dbRelationship.getSourceEntity();

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/trans/QueryAssembler.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/trans/QueryAssembler.java?rev=600160&r1=600159&r2=600160&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/trans/QueryAssembler.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/trans/QueryAssembler.java Sat Dec  1 08:42:05 2007
@@ -109,7 +109,7 @@
             for (int i = 0; i < len; i++) {
                 Object val = values.get(i);
 
-                DbAttribute attr = (DbAttribute) attributes.get(i);
+                DbAttribute attr = attributes.get(i);
 
                 // null DbAttributes are a result of inferior qualifier processing
                 // (qualifier can't map parameters to DbAttributes and therefore

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/trans/QueryAssemblerHelper.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/trans/QueryAssemblerHelper.java?rev=600160&r1=600159&r2=600160&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/trans/QueryAssemblerHelper.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/trans/QueryAssemblerHelper.java Sat Dec  1 08:42:05 2007
@@ -352,7 +352,7 @@
         if (relationship != null) {
             // Can't properly handle multiple joins....
             if (relationship.getJoins().size() == 1) {
-                DbJoin join = (DbJoin) relationship.getJoins().get(0);
+                DbJoin join = relationship.getJoins().get(0);
                 return join.getSource();
             }
         }

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/trans/SelectTranslator.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/trans/SelectTranslator.java?rev=600160&r1=600159&r2=600160&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/trans/SelectTranslator.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/trans/SelectTranslator.java Sat Dec  1 08:42:05 2007
@@ -156,11 +156,11 @@
 
         // append columns (unroll the loop's first element)
         int columnCount = selectColumnExpList.size();
-        queryBuf.append((String) selectColumnExpList.get(0));
+        queryBuf.append(selectColumnExpList.get(0));
         // assume there is at least 1 element
         for (int i = 1; i < columnCount; i++) {
             queryBuf.append(", ");
-            queryBuf.append((String) selectColumnExpList.get(i));
+            queryBuf.append(selectColumnExpList.get(i));
         }
 
         // append from clause
@@ -220,7 +220,7 @@
             return new ColumnDescriptor[0];
         }
 
-        return (ColumnDescriptor[]) resultColumns
+        return resultColumns
                 .toArray(new ColumnDescriptor[resultColumns.size()]);
     }
 
@@ -332,7 +332,7 @@
 
             private void visitRelationship(ArcProperty property) {
                 ObjRelationship rel = property.getRelationship();
-                DbRelationship dbRel = (DbRelationship) rel.getDbRelationships().get(0);
+                DbRelationship dbRel = rel.getDbRelationships().get(0);
 
                 List joins = dbRel.getJoins();
                 int len = joins.size();
@@ -585,7 +585,7 @@
 
             // record ObjAttribute override
             for (int i = 0; i < columns.size(); i++) {
-                ColumnDescriptor column = (ColumnDescriptor) columns.get(i);
+                ColumnDescriptor column = columns.get(i);
                 if (attribute.getName().equals(column.getName())) {
 
                     // kick out the original attribute
@@ -612,7 +612,7 @@
         queryBuf.append(ent.getFullyQualifiedName());
         // The alias should be the alias from the same index in aliasList, not that
         // returned by aliasForTable.
-        queryBuf.append(' ').append((String) aliasList.get(index));
+        queryBuf.append(' ').append(aliasList.get(index));
     }
 
     private void appendJoins(StringBuilder queryBuf, int index) {
@@ -682,7 +682,7 @@
 
         int entIndex = tableList.indexOf(ent);
         if (entIndex >= 0) {
-            return (String) aliasList.get(entIndex);
+            return aliasList.get(entIndex);
         }
         else {
             StringBuilder msg = new StringBuilder();

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/types/DefaultType.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/types/DefaultType.java?rev=600160&r1=600159&r2=600160&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/types/DefaultType.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/types/DefaultType.java Sat Dec  1 08:42:05 2007
@@ -167,7 +167,7 @@
 
     public DefaultType(String className) {
         this.className = className;
-        this.readMethod = (Method) readMethods.get(className);
+        this.readMethod = readMethods.get(className);
 
         if (readMethod == null) {
             throw new CayenneRuntimeException("Unsupported default class: "
@@ -176,7 +176,7 @@
                     + " you will need to implement ExtendedType interface yourself.");
         }
 
-        this.procReadMethod = (Method) procReadMethods.get(className);
+        this.procReadMethod = procReadMethods.get(className);
         if (procReadMethod == null) {
             throw new CayenneRuntimeException("Unsupported default class: "
                     + className

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/openbase/OpenBaseAdapter.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/openbase/OpenBaseAdapter.java?rev=600160&r1=600159&r2=600160&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/openbase/OpenBaseAdapter.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/openbase/OpenBaseAdapter.java Sat Dec  1 08:42:05 2007
@@ -239,7 +239,7 @@
             // ignore extra joins
         }
 
-        DbJoin join = (DbJoin) rel.getJoins().get(0);
+        DbJoin join = rel.getJoins().get(0);
 
         buf
             .append("INSERT INTO _SYS_RELATIONSHIP (")

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/oracle/OracleProcedureAction.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/oracle/OracleProcedureAction.java?rev=600160&r1=600159&r2=600160&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/oracle/OracleProcedureAction.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/oracle/OracleProcedureAction.java Sat Dec  1 08:42:05 2007
@@ -23,10 +23,7 @@
 import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.util.Collections;
-import java.util.HashMap;
 import java.util.List;
-import java.util.Map;
-
 import org.apache.cayenne.DataRow;
 import org.apache.cayenne.access.OperationObserver;
 import org.apache.cayenne.access.QueryLogger;

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/sqlserver/SQLServerMergerFactory.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/sqlserver/SQLServerMergerFactory.java?rev=600160&r1=600159&r2=600160&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/sqlserver/SQLServerMergerFactory.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/sqlserver/SQLServerMergerFactory.java Sat Dec  1 08:42:05 2007
@@ -21,7 +21,6 @@
 import org.apache.cayenne.map.DbAttribute;
 import org.apache.cayenne.map.DbEntity;
 import org.apache.cayenne.merge.AddColumnToDb;
-import org.apache.cayenne.merge.MergeDirection;
 import org.apache.cayenne.merge.MergerFactory;
 import org.apache.cayenne.merge.MergerToken;
 import org.apache.cayenne.merge.SetColumnTypeToDb;

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/ejbql/parser/SimpleNode.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/ejbql/parser/SimpleNode.java?rev=600160&r1=600159&r2=600160&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/ejbql/parser/SimpleNode.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/ejbql/parser/SimpleNode.java Sat Dec  1 08:42:05 2007
@@ -86,7 +86,7 @@
     }
 
     public EJBQLExpression getChild(int index) {
-        return (EJBQLExpression) jjtGetChild(index);
+        return jjtGetChild(index);
     }
 
     public int getChildrenCount() {
@@ -153,7 +153,7 @@
                 + (text && this.text != null ? " [" + this.text + "]" : ""));
         if (children != null) {
             for (int i = 0; i < children.length; ++i) {
-                SimpleNode n = (SimpleNode) children[i];
+                SimpleNode n = children[i];
                 if (n != null) {
                     n.dump(out, prefix + " ", text);
                 }

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/project/validator/ObjRelationshipValidator.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/project/validator/ObjRelationshipValidator.java?rev=600160&r1=600159&r2=600160&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/project/validator/ObjRelationshipValidator.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/project/validator/ObjRelationshipValidator.java Sat Dec  1 08:42:05 2007
@@ -113,7 +113,7 @@
                 && (rel.getDeleteRule() == DeleteRule.NULLIFY)) {
             ObjRelationship inverse = rel.getReverseRelationship();
             if (inverse != null) {
-                DbRelationship firstRel = (DbRelationship) inverse
+                DbRelationship firstRel = inverse
                         .getDbRelationships()
                         .get(0);
                 Iterator attributePairIterator = firstRel.getJoins().iterator();

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/tools/CayenneGenerator.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/tools/CayenneGenerator.java?rev=600160&r1=600159&r2=600160&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/tools/CayenneGenerator.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/tools/CayenneGenerator.java Sat Dec  1 08:42:05 2007
@@ -25,7 +25,6 @@
 import org.apache.cayenne.gen.ClassGenerator;
 import org.apache.cayenne.gen.DefaultClassGenerator;
 import org.apache.tools.ant.BuildException;
-import org.apache.tools.ant.Task;
 import org.apache.tools.ant.types.Path;
 
 import foundrylogic.vpp.VPPConfig;

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/tools/DataPortTask.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/tools/DataPortTask.java?rev=600160&r1=600159&r2=600160&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/tools/DataPortTask.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/tools/DataPortTask.java Sat Dec  1 08:42:05 2007
@@ -33,7 +33,6 @@
 import org.apache.cayenne.util.Util;
 import org.apache.tools.ant.BuildException;
 import org.apache.tools.ant.Project;
-import org.apache.tools.ant.Task;
 
 /**
  * A "cdataport" Ant task implementing a frontend to DataPort allowing porting database

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/tools/DbGeneratorTask.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/tools/DbGeneratorTask.java?rev=600160&r1=600159&r2=600160&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/tools/DbGeneratorTask.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/tools/DbGeneratorTask.java Sat Dec  1 08:42:05 2007
@@ -31,7 +31,6 @@
 import org.apache.cayenne.util.Util;
 import org.apache.tools.ant.BuildException;
 import org.apache.tools.ant.Project;
-import org.apache.tools.ant.Task;
 import org.xml.sax.InputSource;
 
 /**

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/tools/DeploymentConfigurator.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/tools/DeploymentConfigurator.java?rev=600160&r1=600159&r2=600160&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/tools/DeploymentConfigurator.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/tools/DeploymentConfigurator.java Sat Dec  1 08:42:05 2007
@@ -28,7 +28,6 @@
 import org.apache.cayenne.project.ProjectException;
 import org.apache.cayenne.util.Util;
 import org.apache.tools.ant.BuildException;
-import org.apache.tools.ant.Task;
 
 /**
  * A "cdeploy" Ant task providing an Ant frontend to

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/wocompat/EOQuery.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/wocompat/EOQuery.java?rev=600160&r1=600159&r2=600160&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/wocompat/EOQuery.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/wocompat/EOQuery.java Sat Dec  1 08:42:05 2007
@@ -417,7 +417,7 @@
             if ("EOKeyComparisonQualifier".equals(qualifierClass)) {
                 // Comparing two keys or key paths
                 key = (String) qualifierMap.get("leftValue");
-                comparisonValue = (String) qualifierMap.get("rightValue");
+                comparisonValue = qualifierMap.get("rightValue");
 
                 // FIXME: I think EOKeyComparisonQualifier sytle Expressions are not
                 // supported...
@@ -444,7 +444,7 @@
                         Object queryVal = valueMap.get("value");
                         if ("NSNumber".equals(objClass)) {
                             // comparison to NSNumber -- cast
-                            comparisonValue = (Number) queryVal;
+                            comparisonValue = queryVal;
                         }
                         else if ("EONull".equals(objClass)) {
                             // comparison to null

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/wocompat/parser/ParserTokenManager.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/wocompat/parser/ParserTokenManager.java?rev=600160&r1=600159&r2=600160&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/wocompat/parser/ParserTokenManager.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/wocompat/parser/ParserTokenManager.java Sat Dec  1 08:42:05 2007
@@ -20,9 +20,6 @@
 
 
 package org.apache.cayenne.wocompat.parser;
-import java.io.*;
-import java.util.*;
-import org.apache.cayenne.wocompat.PlistDataStructureFactory;
 
 public class ParserTokenManager implements ParserConstants
 {
@@ -864,9 +861,9 @@
          jjimageLen = 0;
         int oct;
         len = image.length();
-        oct = ((int)(image.charAt(len-1)-'0')) +
-              8 * ((int)(image.charAt(len-2)-'0')) +
-              64 * ((int)(image.charAt(len-3)-'0'));
+        oct = ((image.charAt(len-1)-'0')) +
+              8 * ((image.charAt(len-2)-'0')) +
+              64 * ((image.charAt(len-3)-'0'));
         image.setCharAt(len-4, (char)oct);
         image.setLength(len-3);
          break;
@@ -879,7 +876,7 @@
         int dig,c, base=1,hex=0;
         len = image.length();
         for(int i=0; i<4; ++i) {
-          c=(int)image.charAt(len-(i+1));
+          c=image.charAt(len-(i+1));
           if (c<='9') c-='0';
             else if (c<='F') c = (c -'A') + 10;
               else c =(c -'a') + 10;

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/xml/XMLDecoder.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/xml/XMLDecoder.java?rev=600160&r1=600159&r2=600160&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/xml/XMLDecoder.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/xml/XMLDecoder.java Sat Dec  1 08:42:05 2007
@@ -382,7 +382,7 @@
             Collection c = (Collection) PropertyUtils.getProperty(property, xml
                     .getNodeName());
 
-            ret = (Collection) c.getClass().newInstance();
+            ret = c.getClass().newInstance();
         }
         catch (Exception ex) {
             throw new CayenneRuntimeException(

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/CDOCollectionRelationshipTest.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/CDOCollectionRelationshipTest.java?rev=600160&r1=600159&r2=600160&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/CDOCollectionRelationshipTest.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/CDOCollectionRelationshipTest.java Sat Dec  1 08:42:05 2007
@@ -36,7 +36,7 @@
     public void testReadToMany() throws Exception {
         createTestData("prepare");
 
-        CollectionToMany o1 = (CollectionToMany) DataObjectUtils.objectForPK(
+        CollectionToMany o1 = DataObjectUtils.objectForPK(
                 createDataContext(),
                 CollectionToMany.class,
                 1);
@@ -105,7 +105,7 @@
         assertNotNull(targets);
         assertEquals(3, targets.size());
 
-        CollectionToManyTarget newTarget = (CollectionToManyTarget) o1
+        CollectionToManyTarget newTarget = o1
                 .getObjectContext()
                 .newObject(CollectionToManyTarget.class);
 
@@ -131,7 +131,7 @@
         Collection targets = o1.getTargets();
         assertEquals(3, targets.size());
 
-        CollectionToManyTarget target = (CollectionToManyTarget) DataObjectUtils
+        CollectionToManyTarget target = DataObjectUtils
                 .objectForPK(o1.getObjectContext(), CollectionToManyTarget.class, 2);
         o1.removeFromTargets(target);
 
@@ -158,7 +158,7 @@
         assertNotNull(targets);
         assertEquals(3, targets.size());
 
-        CollectionToManyTarget newTarget = (CollectionToManyTarget) o1
+        CollectionToManyTarget newTarget = o1
                 .getObjectContext()
                 .newObject(CollectionToManyTarget.class);
 

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/CDOMapRelationshipTest.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/CDOMapRelationshipTest.java?rev=600160&r1=600159&r2=600160&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/CDOMapRelationshipTest.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/CDOMapRelationshipTest.java Sat Dec  1 08:42:05 2007
@@ -37,7 +37,7 @@
     public void testReadToMany() throws Exception {
         createTestData("prepare");
 
-        MapToMany o1 = (MapToMany) DataObjectUtils.objectForPK(
+        MapToMany o1 = DataObjectUtils.objectForPK(
                 createDataContext(),
                 MapToMany.class,
                 1);
@@ -60,7 +60,7 @@
     public void testReadToManyId() throws Exception {
         createTestData("prepare-id");
 
-        IdMapToMany o1 = (IdMapToMany) DataObjectUtils.objectForPK(
+        IdMapToMany o1 = DataObjectUtils.objectForPK(
                 createDataContext(),
                 IdMapToMany.class,
                 1);
@@ -116,7 +116,7 @@
         assertNotNull(targets);
         assertEquals(3, targets.size());
 
-        MapToManyTarget newTarget = (MapToManyTarget) o1.getObjectContext().newObject(
+        MapToManyTarget newTarget = o1.getObjectContext().newObject(
                 MapToManyTarget.class);
 
         newTarget.setName("X");
@@ -169,7 +169,7 @@
         assertNotNull(targets);
         assertEquals(3, targets.size());
 
-        MapToManyTarget newTarget = (MapToManyTarget) o1.getObjectContext().newObject(
+        MapToManyTarget newTarget = o1.getObjectContext().newObject(
                 MapToManyTarget.class);
 
         newTarget.setName("X");

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/CDOOneToManyFKTest.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/CDOOneToManyFKTest.java?rev=600160&r1=600159&r2=600160&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/CDOOneToManyFKTest.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/CDOOneToManyFKTest.java Sat Dec  1 08:42:05 2007
@@ -35,12 +35,12 @@
         deleteTestData();
         DataContext context = createDataContext();
 
-        ToManyRoot2 src2 = (ToManyRoot2) context.newObject(ToManyRoot2.class);
-        ToManyFkRoot src = (ToManyFkRoot) context.newObject(ToManyFkRoot.class);
+        ToManyRoot2 src2 = context.newObject(ToManyRoot2.class);
+        ToManyFkRoot src = context.newObject(ToManyFkRoot.class);
 
         // this should go away when such mapping becomes fully supported
         src.setDepId(new Integer(1));
-        ToManyFkDep target = (ToManyFkDep) context.newObject(ToManyFkDep.class);
+        ToManyFkDep target = context.newObject(ToManyFkDep.class);
 
         // this should go away when such mapping becomes fully supported
         target.setDepId(new Integer(1));

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/CDOOneToOneFKTest.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/CDOOneToOneFKTest.java?rev=600160&r1=600159&r2=600160&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/CDOOneToOneFKTest.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/CDOOneToOneFKTest.java Sat Dec  1 08:42:05 2007
@@ -42,8 +42,8 @@
     }
 
     public void testReadRelationship() {
-        ToOneFK2 src = (ToOneFK2) context.newObject(ToOneFK2.class);
-        ToOneFK1 target = (ToOneFK1) context.newObject(ToOneFK1.class);
+        ToOneFK2 src = context.newObject(ToOneFK2.class);
+        ToOneFK1 target = context.newObject(ToOneFK1.class);
         src.setToOneToFK(target);
         context.commitChanges();
 
@@ -142,8 +142,8 @@
     }
 
     public void testTakeObjectSnapshotDependentFault() throws Exception {
-        ToOneFK2 src = (ToOneFK2) context.newObject(ToOneFK2.class);
-        ToOneFK1 target = (ToOneFK1) context.newObject(ToOneFK1.class);
+        ToOneFK2 src = context.newObject(ToOneFK2.class);
+        ToOneFK1 target = context.newObject(ToOneFK1.class);
         src.setToOneToFK(target);
         context.commitChanges();
         context = createDataContext();
@@ -157,8 +157,8 @@
     }
 
     public void testDelete() throws Exception {
-        ToOneFK2 src = (ToOneFK2) context.newObject(ToOneFK2.class);
-        ToOneFK1 target = (ToOneFK1) context.newObject(ToOneFK1.class);
+        ToOneFK2 src = context.newObject(ToOneFK2.class);
+        ToOneFK1 target = context.newObject(ToOneFK1.class);
         src.setToOneToFK(target);
         context.commitChanges();
 

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/CDOSetRelationshipTest.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/CDOSetRelationshipTest.java?rev=600160&r1=600159&r2=600160&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/CDOSetRelationshipTest.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/CDOSetRelationshipTest.java Sat Dec  1 08:42:05 2007
@@ -36,7 +36,7 @@
     public void testReadToMany() throws Exception {
         createTestData("prepare");
 
-        SetToMany o1 = (SetToMany) DataObjectUtils.objectForPK(
+        SetToMany o1 = DataObjectUtils.objectForPK(
                 createDataContext(),
                 SetToMany.class,
                 1);
@@ -105,7 +105,7 @@
         assertNotNull(targets);
         assertEquals(3, targets.size());
 
-        SetToManyTarget newTarget = (SetToManyTarget) o1.getObjectContext().newObject(
+        SetToManyTarget newTarget = o1.getObjectContext().newObject(
                 SetToManyTarget.class);
 
         o1.addToTargets(newTarget);
@@ -122,7 +122,7 @@
     public void testRemoveToMany() throws Exception {
         createTestData("prepare");
 
-        SetToMany o1 = (SetToMany) DataObjectUtils.objectForPK(
+        SetToMany o1 = DataObjectUtils.objectForPK(
                 createDataContext(),
                 SetToMany.class,
                 1);
@@ -130,7 +130,7 @@
         Set targets = o1.getTargets();
         assertEquals(3, targets.size());
 
-        SetToManyTarget target = (SetToManyTarget) DataObjectUtils.objectForPK(o1
+        SetToManyTarget target = DataObjectUtils.objectForPK(o1
                 .getObjectContext(), SetToManyTarget.class, 2);
         o1.removeFromTargets(target);
 
@@ -157,7 +157,7 @@
         assertNotNull(targets);
         assertEquals(3, targets.size());
 
-        SetToManyTarget newTarget = (SetToManyTarget) o1.getObjectContext().newObject(
+        SetToManyTarget newTarget = o1.getObjectContext().newObject(
                 SetToManyTarget.class);
 
         newTarget.setSetToMany(o1);

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/CayenneContextClientChannelEventsTest.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/CayenneContextClientChannelEventsTest.java?rev=600160&r1=600159&r2=600160&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/CayenneContextClientChannelEventsTest.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/CayenneContextClientChannelEventsTest.java Sat Dec  1 08:42:05 2007
@@ -57,7 +57,7 @@
         CayenneContext c1 = new CayenneContext(clientChannel);
         CayenneContext c2 = new CayenneContext(clientChannel);
 
-        ClientMtTable1 o1 = (ClientMtTable1) c1.newObject(ClientMtTable1.class);
+        ClientMtTable1 o1 = c1.newObject(ClientMtTable1.class);
         o1.setGlobalAttribute1("X");
         c1.commitChanges();
 
@@ -90,12 +90,12 @@
         CayenneContext c2 = new CayenneContext(clientChannel);
 
         // insert, then delete - this shouldn't propagate via an event.
-        ClientMtTable1 o1 = (ClientMtTable1) c1.newObject(ClientMtTable1.class);
+        ClientMtTable1 o1 = c1.newObject(ClientMtTable1.class);
         o1.setGlobalAttribute1("X");
         c1.deleteObject(o1);
 
         // introduce some other change so that commit can go ahead...
-        ClientMtTable1 o1x = (ClientMtTable1) c1.newObject(ClientMtTable1.class);
+        ClientMtTable1 o1x = c1.newObject(ClientMtTable1.class);
         o1x.setGlobalAttribute1("Y");
         c1.commitChanges();
 
@@ -124,7 +124,7 @@
         // make sure c2 has uncommitted changes
         c2.newObject(ClientMtTable1.class);
 
-        ClientMtTable1 o1 = (ClientMtTable1) c1.newObject(ClientMtTable1.class);
+        ClientMtTable1 o1 = c1.newObject(ClientMtTable1.class);
         o1.setGlobalAttribute1("X");
         c1.commitChanges();
 
@@ -240,7 +240,7 @@
         assertEquals(1, o1.getTable2Array().size());
         assertEquals(1, o2.getTable2Array().size());
 
-        ClientMtTable2 o1r = (ClientMtTable2) c1.newObject(ClientMtTable2.class);
+        ClientMtTable2 o1r = c1.newObject(ClientMtTable2.class);
         o1r.setGlobalAttribute("X");
         o1.addToTable2Array(o1r);
 
@@ -276,7 +276,7 @@
 
         assertEquals(1, o1.getTable2Array().size());
 
-        ClientMtTable2 o1r = (ClientMtTable2) c1.newObject(ClientMtTable2.class);
+        ClientMtTable2 o1r = c1.newObject(ClientMtTable2.class);
         o1r.setGlobalAttribute("X");
         o1.addToTable2Array(o1r);
 
@@ -346,8 +346,8 @@
         CayenneContext c1 = new CayenneContext(clientChannel);
         CayenneContext c2 = new CayenneContext(clientChannel);
 
-        ClientMtTable4 o1 = (ClientMtTable4) c1.newObject(ClientMtTable4.class);
-        ClientMtTable5 o1r = (ClientMtTable5) c1.newObject(ClientMtTable5.class);
+        ClientMtTable4 o1 = c1.newObject(ClientMtTable4.class);
+        ClientMtTable5 o1r = c1.newObject(ClientMtTable5.class);
         c1.commitChanges();
 
         ClientMtTable4 o2 = (ClientMtTable4) c2.localObject(o1.getObjectId(), null);

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/CayenneContextDeleteRulesTest.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/CayenneContextDeleteRulesTest.java?rev=600160&r1=600159&r2=600160&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/CayenneContextDeleteRulesTest.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/CayenneContextDeleteRulesTest.java Sat Dec  1 08:42:05 2007
@@ -48,11 +48,11 @@
     public void testNullifyToOne() {
         CayenneContext context = createClientContext();
 
-        ClientMtDeleteNullify object = (ClientMtDeleteNullify) context
+        ClientMtDeleteNullify object = context
                 .newObject(ClientMtDeleteNullify.class);
         object.setName("object");
 
-        ClientMtDeleteRule related = (ClientMtDeleteRule) context
+        ClientMtDeleteRule related = context
                 .newObject(ClientMtDeleteRule.class);
         object.setName("related");
 
@@ -71,9 +71,9 @@
 
         CayenneContext context = createClientContext();
 
-        ClientMtDeleteDeny object = (ClientMtDeleteDeny) context
+        ClientMtDeleteDeny object = context
                 .newObject(ClientMtDeleteDeny.class);
-        ClientMtDeleteRule related = (ClientMtDeleteRule) context
+        ClientMtDeleteRule related = context
                 .newObject(ClientMtDeleteRule.class);
         object.setDeny(related);
         context.commitChanges();
@@ -94,11 +94,11 @@
     public void testCascadeToOne() {
         CayenneContext context = createClientContext();
 
-        ClientMtDeleteCascade object = (ClientMtDeleteCascade) context
+        ClientMtDeleteCascade object = context
                 .newObject(ClientMtDeleteCascade.class);
         object.setName("object");
 
-        ClientMtDeleteRule related = (ClientMtDeleteRule) context
+        ClientMtDeleteRule related = context
                 .newObject(ClientMtDeleteRule.class);
         object.setName("related");
 
@@ -116,11 +116,11 @@
     public void testCascadeToOneNewObject() {
         CayenneContext context = createClientContext();
 
-        ClientMtDeleteRule related = (ClientMtDeleteRule) context
+        ClientMtDeleteRule related = context
                 .newObject(ClientMtDeleteRule.class);
         context.commitChanges();
 
-        ClientMtDeleteCascade object = (ClientMtDeleteCascade) context
+        ClientMtDeleteCascade object = context
                 .newObject(ClientMtDeleteCascade.class);
         object.setName("object");
         object.setCascade(related);

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/CayenneContextMapRelationshipTest.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/CayenneContextMapRelationshipTest.java?rev=600160&r1=600159&r2=600160&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/CayenneContextMapRelationshipTest.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/CayenneContextMapRelationshipTest.java Sat Dec  1 08:42:05 2007
@@ -84,7 +84,7 @@
         assertNotNull(targets);
         assertEquals(3, targets.size());
 
-        ClientMtMapToManyTarget newTarget = (ClientMtMapToManyTarget) o1
+        ClientMtMapToManyTarget newTarget = o1
                 .getObjectContext()
                 .newObject(ClientMtMapToManyTarget.class);
 

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/CayenneContextMergeHandlerTest.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/CayenneContextMergeHandlerTest.java?rev=600160&r1=600159&r2=600160&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/CayenneContextMergeHandlerTest.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/CayenneContextMergeHandlerTest.java Sat Dec  1 08:42:05 2007
@@ -71,7 +71,7 @@
                 .getClientEntityResolver());
 
         CayenneContext context = new CayenneContext(channel);
-        ClientMtTable1 o1 = (ClientMtTable1) context.newObject(ClientMtTable1.class);
+        ClientMtTable1 o1 = context.newObject(ClientMtTable1.class);
 
         CayenneContextMergeHandler handler = new CayenneContextMergeHandler(context);
 

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/CayenneContextValidationTest.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/CayenneContextValidationTest.java?rev=600160&r1=600159&r2=600160&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/CayenneContextValidationTest.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/CayenneContextValidationTest.java Sat Dec  1 08:42:05 2007
@@ -47,12 +47,12 @@
 
         CayenneContext c = new CayenneContext(clientChannel);
         
-        ClientMtTable1 o1 = (ClientMtTable1) c.newObject(ClientMtTable1.class);
+        ClientMtTable1 o1 = c.newObject(ClientMtTable1.class);
         o1.setGlobalAttribute1("G1");
         o1.resetValidation(false);
         
         // this one is not validating
-        ClientMtTable2 o2 = (ClientMtTable2) c.newObject(ClientMtTable2.class);
+        ClientMtTable2 o2 = c.newObject(ClientMtTable2.class);
         o2.setTable1(o1);
         
         c.commitChanges();
@@ -77,7 +77,7 @@
         assertTrue(o1.isValidatedForDelete());
         assertFalse(o1.isValidatedForUpdate());
         
-        ClientMtTable1 o11 = (ClientMtTable1) c.newObject(ClientMtTable1.class);
+        ClientMtTable1 o11 = c.newObject(ClientMtTable1.class);
         o11.setGlobalAttribute1("G1");
         o11.resetValidation(true);
         

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/CayenneContextWithDataContextTest.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/CayenneContextWithDataContextTest.java?rev=600160&r1=600159&r2=600160&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/CayenneContextWithDataContextTest.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/CayenneContextWithDataContextTest.java Sat Dec  1 08:42:05 2007
@@ -191,7 +191,7 @@
 
             CayenneContext context = new CayenneContext(channel);
 
-            ClientMtTable1 object = (ClientMtTable1) context
+            ClientMtTable1 object = context
                     .newObject(ClientMtTable1.class);
 
             assertFalse(flag[0]);
@@ -248,11 +248,11 @@
 
             CayenneContext context = new CayenneContext(channel);
 
-            ClientMtReflexive o1 = (ClientMtReflexive) context
+            ClientMtReflexive o1 = context
                     .newObject(ClientMtReflexive.class);
             o1.setName("parent");
 
-            ClientMtReflexive o2 = (ClientMtReflexive) context
+            ClientMtReflexive o2 = context
                     .newObject(ClientMtReflexive.class);
             o2.setName("child");
             o2.setToParent(o1);
@@ -490,7 +490,7 @@
         ClientChannel channel = new ClientChannel(connection);
         CayenneContext context = new CayenneContext(channel);
 
-        ClientMtTable1 o = (ClientMtTable1) context.newObject(ClientMtTable1.class);
+        ClientMtTable1 o = context.newObject(ClientMtTable1.class);
         o.setGlobalAttribute1("aaa");
 
         // fetch new

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/CayenneDataObjectFlattenedRelTest.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/CayenneDataObjectFlattenedRelTest.java?rev=600160&r1=600159&r2=600160&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/CayenneDataObjectFlattenedRelTest.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/CayenneDataObjectFlattenedRelTest.java Sat Dec  1 08:42:05 2007
@@ -48,7 +48,7 @@
         DataContext context = createDataContext();
 
         createTestData("testReadFlattenedRelationship");
-        Artist a1 = (Artist) DataObjectUtils.objectForPK(context, Artist.class, 33001);
+        Artist a1 = DataObjectUtils.objectForPK(context, Artist.class, 33001);
         List groupList = a1.getGroupArray();
         assertNotNull(groupList);
         assertEquals(0, groupList.size());
@@ -59,7 +59,7 @@
 
         createTestData("testReadFlattenedRelationship2");
 
-        Artist a1 = (Artist) DataObjectUtils.objectForPK(context, Artist.class, 33001);
+        Artist a1 = DataObjectUtils.objectForPK(context, Artist.class, 33001);
         List groupList = a1.getGroupArray();
         assertNotNull(groupList);
         assertEquals(1, groupList.size());
@@ -110,7 +110,7 @@
         createTestData("testDoubleCommitAddToFlattenedRelationship");
         DataContext context = createDataContext();
 
-        Artist a1 = (Artist) DataObjectUtils.objectForPK(context, Artist.class, 33001);
+        Artist a1 = DataObjectUtils.objectForPK(context, Artist.class, 33001);
 
         SelectQuery q = new SelectQuery(ArtGroup.class, ExpressionFactory.matchExp(
                 "name",
@@ -144,7 +144,7 @@
         createTestData("testRemoveFromFlattenedRelationship");
         DataContext context = createDataContext();
 
-        Artist a1 = (Artist) DataObjectUtils.objectForPK(context, Artist.class, 33001);
+        Artist a1 = DataObjectUtils.objectForPK(context, Artist.class, 33001);
 
         ArtGroup group = (ArtGroup) a1.getGroupArray().get(0);
         a1.removeFromGroupArray(group);
@@ -166,7 +166,7 @@
     public void testRemoveFlattenedRelationshipAndRootRecord() throws Exception {
         DataContext context = createDataContext();
         createTestData("testRemoveFlattenedRelationshipAndRootRecord");
-        Artist a1 = (Artist) DataObjectUtils.objectForPK(context, Artist.class, 33001);
+        Artist a1 = DataObjectUtils.objectForPK(context, Artist.class, 33001);
 
         ArtGroup group = (ArtGroup) a1.getGroupArray().get(0);
         a1.removeFromGroupArray(group); // Cause the delete of the link record

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/CayenneDataObjectInCtxtTest.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/CayenneDataObjectInCtxtTest.java?rev=600160&r1=600159&r2=600160&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/CayenneDataObjectInCtxtTest.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/CayenneDataObjectInCtxtTest.java Sat Dec  1 08:42:05 2007
@@ -293,7 +293,7 @@
     public void testObjectsCommittedManualOID() {
         DataContext context = createDataContext();
 
-        Artist object = (Artist) context.newObject(Artist.class);
+        Artist object = context.newObject(Artist.class);
         object.setArtistName("ABC1");
         assertEquals(PersistenceState.NEW, object.getPersistenceState());
 
@@ -309,7 +309,7 @@
         // refetch
         context.invalidateObjects(Collections.singleton(object));
 
-        Artist object2 = (Artist) DataObjectUtils.objectForPK(context, Artist.class, 3);
+        Artist object2 = DataObjectUtils.objectForPK(context, Artist.class, 3);
         assertNotNull(object2);
         assertEquals("ABC1", object2.getArtistName());
     }

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/CayenneDataObjectRelTest.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/CayenneDataObjectRelTest.java?rev=600160&r1=600159&r2=600160&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/CayenneDataObjectRelTest.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/CayenneDataObjectRelTest.java Sat Dec  1 08:42:05 2007
@@ -267,7 +267,7 @@
     }
 
     public void testNewToMany() throws Exception {
-        Artist artist = (Artist) ctxt.newObject(Artist.class);
+        Artist artist = ctxt.newObject(Artist.class);
         artist.setArtistName("test");
         assertTrue(artist.readPropertyDirectly("paintingArray") instanceof ToManyList);
 

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/CayenneDataObjectValidationTest.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/CayenneDataObjectValidationTest.java?rev=600160&r1=600159&r2=600160&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/CayenneDataObjectValidationTest.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/CayenneDataObjectValidationTest.java Sat Dec  1 08:42:05 2007
@@ -39,7 +39,7 @@
 
     public void testValidateForSaveMandatoryToOneMissing() throws Exception {
         DataContext context = createDataContext();
-        Exhibit exhibit = (Exhibit) context.newObject(Exhibit.class);
+        Exhibit exhibit = context.newObject(Exhibit.class);
         exhibit.setOpeningDate(new Date());
         exhibit.setClosingDate(new Date());
 
@@ -56,7 +56,7 @@
         assertEquals(Exhibit.TO_GALLERY_PROPERTY, failure.getProperty());
 
         // fix the problem and see if it goes away
-        Gallery gallery = (Gallery) context.newObject(Gallery.class);
+        Gallery gallery = context.newObject(Gallery.class);
         exhibit.setToGallery(gallery);
         result = new ValidationResult();
         exhibit.validateForSave(result);

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/CompoundPkChangeTest.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/CompoundPkChangeTest.java?rev=600160&r1=600159&r2=600160&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/CompoundPkChangeTest.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/CompoundPkChangeTest.java Sat Dec  1 08:42:05 2007
@@ -39,7 +39,7 @@
     public void testCompoundPkChangeSingleElement() throws Exception {
         DataContext context = createDataContext();
 
-        CompoundPkTestEntity dao = (CompoundPkTestEntity) context
+        CompoundPkTestEntity dao = context
                 .newObject(CompoundPkTestEntity.class);
         CompoundPkTestEntity refreshedDao = null;
 
@@ -83,7 +83,7 @@
     public void testCompoundPkChangeAllElements() throws Exception {
         DataContext context = createDataContext();
 
-        CompoundPkTestEntity dao = (CompoundPkTestEntity) context
+        CompoundPkTestEntity dao = context
                 .newObject(CompoundPkTestEntity.class);
         CompoundPkTestEntity refreshedDao = null;
 

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/FlattenedRelationshipsTest.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/FlattenedRelationshipsTest.java?rev=600160&r1=600159&r2=600160&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/FlattenedRelationshipsTest.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/FlattenedRelationshipsTest.java Sat Dec  1 08:42:05 2007
@@ -47,11 +47,11 @@
     }
 
     public void testInsertJoinWithPK() throws Exception {
-        FlattenedTest1 obj01 = (FlattenedTest1) context
+        FlattenedTest1 obj01 = context
                 .newObject(FlattenedTest1.class);
-        FlattenedTest3 obj11 = (FlattenedTest3) context
+        FlattenedTest3 obj11 = context
                 .newObject(FlattenedTest3.class);
-        FlattenedTest3 obj12 = (FlattenedTest3) context
+        FlattenedTest3 obj12 = context
                 .newObject(FlattenedTest3.class);
 
         obj01.setName("t01");
@@ -66,7 +66,7 @@
         int pk = DataObjectUtils.intPKForObject(obj01);
 
         context = createDataContext();
-        FlattenedTest1 fresh01 = (FlattenedTest1) DataObjectUtils.objectForPK(
+        FlattenedTest1 fresh01 = DataObjectUtils.objectForPK(
                 context,
                 FlattenedTest1.class,
                 pk);
@@ -87,7 +87,7 @@
         joinSelect.setFetchingDataRows(true);
         assertEquals(3, context.performQuery(joinSelect).size());
 
-        FlattenedTest1 ft1 = (FlattenedTest1) DataObjectUtils.objectForPK(
+        FlattenedTest1 ft1 = DataObjectUtils.objectForPK(
                 context,
                 FlattenedTest1.class,
                 2);
@@ -98,7 +98,7 @@
 
         assertEquals(2, related.size());
 
-        FlattenedTest3 ft3 = (FlattenedTest3) DataObjectUtils.objectForPK(
+        FlattenedTest3 ft3 = DataObjectUtils.objectForPK(
                 context,
                 FlattenedTest3.class,
                 3);
@@ -115,20 +115,20 @@
     }
 
     public void testQualifyOnToManyFlattened() throws Exception {
-        FlattenedTest1 obj01 = (FlattenedTest1) context
+        FlattenedTest1 obj01 = context
                 .newObject(FlattenedTest1.class);
-        FlattenedTest2 obj02 = (FlattenedTest2) context
+        FlattenedTest2 obj02 = context
                 .newObject(FlattenedTest2.class);
-        FlattenedTest3 obj031 = (FlattenedTest3) context
+        FlattenedTest3 obj031 = context
                 .newObject(FlattenedTest3.class);
-        FlattenedTest3 obj032 = (FlattenedTest3) context
+        FlattenedTest3 obj032 = context
                 .newObject(FlattenedTest3.class);
 
-        FlattenedTest1 obj11 = (FlattenedTest1) context
+        FlattenedTest1 obj11 = context
                 .newObject(FlattenedTest1.class);
-        FlattenedTest2 obj12 = (FlattenedTest2) context
+        FlattenedTest2 obj12 = context
                 .newObject(FlattenedTest2.class);
-        FlattenedTest3 obj131 = (FlattenedTest3) context
+        FlattenedTest3 obj131 = context
                 .newObject(FlattenedTest3.class);
 
         obj01.setName("t01");

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/GeneratedMethodsInClientObjectContextTest.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/GeneratedMethodsInClientObjectContextTest.java?rev=600160&r1=600159&r2=600160&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/GeneratedMethodsInClientObjectContextTest.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/GeneratedMethodsInClientObjectContextTest.java Sat Dec  1 08:42:05 2007
@@ -45,16 +45,16 @@
         CayenneContext context = new CayenneContext();
         context.setEntityResolver(resolver);
 
-        ClientMtTable1 t1 = (ClientMtTable1) context.newObject(ClientMtTable1.class);
-        ClientMtTable2 t2 = (ClientMtTable2) context.newObject(ClientMtTable2.class);
+        ClientMtTable1 t1 = context.newObject(ClientMtTable1.class);
+        ClientMtTable2 t2 = context.newObject(ClientMtTable2.class);
 
         t1.addToTable2Array(t2);
         assertEquals(1, t1.getTable2Array().size());
         assertSame(t1, t2.getTable1());
         
         // do it again to make sure action can handle series of changes
-        ClientMtTable1 t3 = (ClientMtTable1) context.newObject(ClientMtTable1.class);
-        ClientMtTable2 t4 = (ClientMtTable2) context.newObject(ClientMtTable2.class);
+        ClientMtTable1 t3 = context.newObject(ClientMtTable1.class);
+        ClientMtTable2 t4 = context.newObject(ClientMtTable2.class);
 
         t3.addToTable2Array(t4);
         assertEquals(1, t3.getTable2Array().size());
@@ -70,8 +70,8 @@
         CayenneContext context = new CayenneContext();
         context.setEntityResolver(resolver);
 
-        ClientMtTable1 t1 = (ClientMtTable1) context.newObject(ClientMtTable1.class);
-        ClientMtTable2 t2 = (ClientMtTable2) context.newObject(ClientMtTable2.class);
+        ClientMtTable1 t1 = context.newObject(ClientMtTable1.class);
+        ClientMtTable2 t2 = context.newObject(ClientMtTable2.class);
 
         t2.setTable1(t1);
         assertEquals(1, t1.getTable2Array().size());

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/MeaningfulFKTest.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/MeaningfulFKTest.java?rev=600160&r1=600159&r2=600160&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/MeaningfulFKTest.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/MeaningfulFKTest.java Sat Dec  1 08:42:05 2007
@@ -30,7 +30,7 @@
 public class MeaningfulFKTest extends RelationshipCase {
 
     public void testValidateForSave1() throws Exception {
-        MeaningfulFK testObject = (MeaningfulFK) createDataContext().newObject(
+        MeaningfulFK testObject = createDataContext().newObject(
                 MeaningfulFK.class);
 
         ValidationResult validation = new ValidationResult();
@@ -45,10 +45,10 @@
     }
 
     public void testValidateForSave2() throws Exception {
-        MeaningfulFK testObject = (MeaningfulFK) createDataContext().newObject(
+        MeaningfulFK testObject = createDataContext().newObject(
                 MeaningfulFK.class);
 
-        RelationshipHelper related = (RelationshipHelper) testObject
+        RelationshipHelper related = testObject
                 .getObjectContext()
                 .newObject(RelationshipHelper.class);
         testObject.setToRelationshipHelper(related);

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/PersistenceByReachabilityTest.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/PersistenceByReachabilityTest.java?rev=600160&r1=600159&r2=600160&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/PersistenceByReachabilityTest.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/PersistenceByReachabilityTest.java Sat Dec  1 08:42:05 2007
@@ -28,7 +28,7 @@
 
     public void testToOneTargetTransient() throws Exception {
         DataContext context = createDataContext();
-        Painting persistentDO = (Painting) context.newObject(Painting.class);
+        Painting persistentDO = context.newObject(Painting.class);
 
         Artist transientDO = new Artist();
         persistentDO.setToOneTarget(Painting.TO_ARTIST_PROPERTY, transientDO, false);
@@ -38,7 +38,7 @@
 
     public void testToOneTargetPersistent() throws Exception {
         DataContext context = createDataContext();
-        Painting transientDO = (Painting) context.newObject(Painting.class);
+        Painting transientDO = context.newObject(Painting.class);
 
         Artist persistentDO = new Artist();
         transientDO.setToOneTarget(Painting.TO_ARTIST_PROPERTY, persistentDO, false);
@@ -48,10 +48,10 @@
 
     public void testToOneTargetDifferentContext() throws Exception {
         DataContext context1 = createDataContext();
-        Painting doC1 = (Painting) context1.newObject(Painting.class);
+        Painting doC1 = context1.newObject(Painting.class);
 
         DataContext context2 = createDataContext();
-        Artist doC2 = (Artist) context2.newObject(Artist.class);
+        Artist doC2 = context2.newObject(Artist.class);
 
         // this is the case where exception must be thrown as DataContexts are
         // different
@@ -66,10 +66,10 @@
 
     public void testToManyTargetDifferentContext() throws Exception {
         DataContext context1 = createDataContext();
-        Painting doC1 = (Painting) context1.newObject(Painting.class);
+        Painting doC1 = context1.newObject(Painting.class);
 
         DataContext context2 = createDataContext();
-        Artist doC2 = (Artist) context2.newObject(Artist.class);
+        Artist doC2 = context2.newObject(Artist.class);
 
         // this is the case where exception must be thrown as DataContexts are
         // different
@@ -84,7 +84,7 @@
 
     public void testToManyTargetTransient() throws Exception {
         DataContext context = createDataContext();
-        Painting transientDO = (Painting) context.newObject(Painting.class);
+        Painting transientDO = context.newObject(Painting.class);
 
         Artist persistentDO = new Artist();
         persistentDO.addToManyTarget(Artist.PAINTING_ARRAY_PROPERTY, transientDO, false);
@@ -94,7 +94,7 @@
 
     public void testToManyTargetPersistent() throws Exception {
         DataContext context = createDataContext();
-        Painting persistentDO = (Painting) context.newObject(Painting.class);
+        Painting persistentDO = context.newObject(Painting.class);
 
         Artist transientDO = new Artist();
         transientDO.addToManyTarget(Artist.PAINTING_ARRAY_PROPERTY, persistentDO, false);



Mime
View raw message