You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cayenne.apache.org by am...@apache.org on 2008/01/12 09:24:27 UTC
svn commit: r611387 - in
/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src:
main/java/org/apache/cayenne/access/
main/java/org/apache/cayenne/project/validator/
test/java/org/apache/cayenne/ test/java/org/apache/cayenne/access/
Author: amaniatis
Date: Sat Jan 12 00:24:25 2008
New Revision: 611387
URL: http://svn.apache.org/viewvc?rev=611387&view=rev
Log:
Generics and unnecessary casts.
Modified:
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/ToOneFault.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/project/validator/ObjEntityValidator.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/project/validator/SQLTemplateValidator.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/project/validator/SelectQueryValidator.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/CDOOne2ManyTest.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/access/DataContextProcedureQueryTest.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/RefreshQueryInContextTest.java
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=611387&r1=611386&r2=611387&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 Jan 12 00:24:25 2008
@@ -131,7 +131,7 @@
final Persistent object,
final DataRow snapshot) {
- final ObjectDiff diff = (ObjectDiff) context
+ final ObjectDiff diff = context
.getObjectStore()
.getChangesByObjectId()
.get(object.getObjectId());
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/ToOneFault.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/ToOneFault.java?rev=611387&r1=611386&r2=611387&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/ToOneFault.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/ToOneFault.java Sat Jan 12 00:24:25 2008
@@ -50,7 +50,7 @@
if ((state == PersistenceState.MODIFIED || state == PersistenceState.DELETED)
&& context instanceof DataContext) {
- ObjectDiff diff = (ObjectDiff) ((DataContext) context)
+ ObjectDiff diff = ((DataContext) context)
.getObjectStore()
.getChangesByObjectId()
.get(sourceObject.getObjectId());
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/project/validator/ObjEntityValidator.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/project/validator/ObjEntityValidator.java?rev=611387&r1=611386&r2=611387&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/project/validator/ObjEntityValidator.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/project/validator/ObjEntityValidator.java Sat Jan 12 00:24:25 2008
@@ -19,8 +19,6 @@
package org.apache.cayenne.project.validator;
-import java.util.Iterator;
-
import org.apache.cayenne.access.DataDomain;
import org.apache.cayenne.map.DataMap;
import org.apache.cayenne.map.ObjEntity;
@@ -124,9 +122,7 @@
}
// check for duplicate names in the parent context
- Iterator it = map.getObjEntities().iterator();
- while (it.hasNext()) {
- ObjEntity otherEnt = (ObjEntity) it.next();
+ for (ObjEntity otherEnt : map.getObjEntities()) {
if (otherEnt == entity) {
continue;
}
@@ -138,11 +134,9 @@
}
// check for dupliucates in other DataMaps
- DataDomain domain = (DataDomain) path.firstInstanceOf(DataDomain.class);
+ DataDomain domain = path.firstInstanceOf(DataDomain.class);
if (domain != null) {
- Iterator maps = domain.getDataMaps().iterator();
- while (maps.hasNext()) {
- DataMap nextMap = (DataMap) maps.next();
+ for (DataMap nextMap : domain.getDataMaps()) {
if (nextMap == map) {
continue;
}
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/project/validator/SQLTemplateValidator.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/project/validator/SQLTemplateValidator.java?rev=611387&r1=611386&r2=611387&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/project/validator/SQLTemplateValidator.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/project/validator/SQLTemplateValidator.java Sat Jan 12 00:24:25 2008
@@ -64,7 +64,7 @@
}
protected void validateRoot(SQLTemplate query, ProjectPath path, Validator validator) {
- DataMap map = (DataMap) path.firstInstanceOf(DataMap.class);
+ DataMap map = path.firstInstanceOf(DataMap.class);
if (query.getRoot() == null && map != null) {
validator.registerWarning("Query has no root", path);
}
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/project/validator/SelectQueryValidator.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/project/validator/SelectQueryValidator.java?rev=611387&r1=611386&r2=611387&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/project/validator/SelectQueryValidator.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/project/validator/SelectQueryValidator.java Sat Jan 12 00:24:25 2008
@@ -77,7 +77,7 @@
}
protected Entity validateRoot(SelectQuery query, ProjectPath path, Validator validator) {
- DataMap map = (DataMap) path.firstInstanceOf(DataMap.class);
+ DataMap map = path.firstInstanceOf(DataMap.class);
if (query.getRoot() == null && map != null) {
validator.registerWarning("Query has no root", path);
return null;
@@ -105,7 +105,7 @@
// resolve entity
if (query.getRoot() instanceof String) {
- QueryEngine parent = (QueryEngine) path.firstInstanceOf(QueryEngine.class);
+ QueryEngine parent = path.firstInstanceOf(QueryEngine.class);
if (parent != null) {
return parent.getEntityResolver().getObjEntity((String) query.getRoot());
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/CDOOne2ManyTest.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/CDOOne2ManyTest.java?rev=611387&r1=611386&r2=611387&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/CDOOne2ManyTest.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/CDOOne2ManyTest.java Sat Jan 12 00:24:25 2008
@@ -96,7 +96,7 @@
// test database data
Artist a2 = fetchArtist();
assertEquals(1, a2.getPaintingArray().size());
- assertEquals(paintingName, ((Painting) a2.getPaintingArray().get(0))
+ assertEquals(paintingName, (a2.getPaintingArray().get(0))
.getPaintingTitle());
}
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=611387&r1=611386&r2=611387&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 Jan 12 00:24:25 2008
@@ -146,7 +146,7 @@
Artist a1 = DataObjectUtils.objectForPK(context, Artist.class, 33001);
- ArtGroup group = (ArtGroup) a1.getGroupArray().get(0);
+ ArtGroup group = a1.getGroupArray().get(0);
a1.removeFromGroupArray(group);
List groupList = a1.getGroupArray();
@@ -168,7 +168,7 @@
createTestData("testRemoveFlattenedRelationshipAndRootRecord");
Artist a1 = DataObjectUtils.objectForPK(context, Artist.class, 33001);
- ArtGroup group = (ArtGroup) a1.getGroupArray().get(0);
+ ArtGroup group = a1.getGroupArray().get(0);
a1.removeFromGroupArray(group); // Cause the delete of the link record
context.deleteObject(a1); // Cause the deletion of the artist
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextProcedureQueryTest.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextProcedureQueryTest.java?rev=611387&r1=611386&r2=611387&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextProcedureQueryTest.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextProcedureQueryTest.java Sat Jan 12 00:24:25 2008
@@ -92,7 +92,7 @@
assertEquals(1, artists.size());
Artist a = (Artist) artists.get(0);
- Painting p = (Painting) a.getPaintingArray().get(0);
+ Painting p = a.getPaintingArray().get(0);
assertEquals(2000, p.getEstimatedPrice().intValue());
}
@@ -128,7 +128,7 @@
assertEquals(1, artists.size());
Artist a = (Artist) artists.get(0);
- Painting p = (Painting) a.getPaintingArray().get(0);
+ Painting p = a.getPaintingArray().get(0);
assertEquals(2000, p.getEstimatedPrice().intValue());
}
@@ -153,7 +153,7 @@
Artist.class,
uppercaseConverter(artistRow),
false);
- Painting p = (Painting) a.getPaintingArray().get(0);
+ Painting p = a.getPaintingArray().get(0);
// invalidate painting, it may have been updated in the proc
ctxt.invalidateObjects(Collections.singletonList(p));
@@ -182,7 +182,7 @@
Artist.class,
uppercaseConverter(artistRow),
false);
- Painting p = (Painting) a.getPaintingArray().get(0);
+ Painting p = a.getPaintingArray().get(0);
// invalidate painting, it may have been updated in the proc
ctxt.invalidateObjects(Collections.singletonList(p));
@@ -213,7 +213,7 @@
Artist.class,
uppercaseConverter(artistRow),
false);
- Painting p = (Painting) a.getPaintingArray().get(0);
+ Painting p = a.getPaintingArray().get(0);
// invalidate painting, it may have been updated in the proc
ctxt.invalidateObjects(Collections.singletonList(p));
@@ -263,7 +263,7 @@
assertNotNull("Null result from StoredProcedure.", artists);
assertEquals(1, artists.size());
Artist a = (Artist) artists.get(0);
- Painting p = (Painting) a.getPaintingArray().get(0);
+ Painting p = a.getPaintingArray().get(0);
// invalidate painting, it may have been updated in the proc
ctxt.invalidateObjects(Collections.singletonList(p));
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DeleteRulesTest.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DeleteRulesTest.java?rev=611387&r1=611386&r2=611387&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DeleteRulesTest.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DeleteRulesTest.java Sat Jan 12 00:24:25 2008
@@ -339,7 +339,7 @@
private void assertJoinDeleted(DeleteRuleFlatA a, DeleteRuleFlatB b) {
- ObjectDiff changes = (ObjectDiff) context.getObjectStore().changes.get(a
+ ObjectDiff changes = context.getObjectStore().changes.get(a
.getObjectId());
assertNotNull(changes);
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/RefreshQueryInContextTest.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/RefreshQueryInContextTest.java?rev=611387&r1=611386&r2=611387&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/RefreshQueryInContextTest.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/RefreshQueryInContextTest.java Sat Jan 12 00:24:25 2008
@@ -361,8 +361,8 @@
Artist a1 = (Artist) artists.get(0);
Artist a2 = (Artist) artists.get(1);
- Painting p1 = (Painting) a1.getPaintingArray().get(0);
- Painting p2 = (Painting) a1.getPaintingArray().get(0);
+ Painting p1 = a1.getPaintingArray().get(0);
+ Painting p2 = a1.getPaintingArray().get(0);
assertNotNull(context
.getParentDataDomain()