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 2007/12/01 17:42:12 UTC
svn commit: r600160 [3/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...
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/dba/PkGeneratorTest.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/dba/PkGeneratorTest.java?rev=600160&r1=600159&r2=600160&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/dba/PkGeneratorTest.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/dba/PkGeneratorTest.java Sat Dec 1 08:42:05 2007
@@ -34,7 +34,7 @@
protected void setUp() throws Exception {
deleteTestData();
- node = (DataNode) getDomain().getDataNodes().iterator().next();
+ node = getDomain().getDataNodes().iterator().next();
pkGen = node.getAdapter().getPkGenerator();
paintEnt = getDbEntity("PAINTING");
List list = new ArrayList();
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/map/MapLoaderLoadTest.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/map/MapLoaderLoadTest.java?rev=600160&r1=600159&r2=600160&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/map/MapLoaderLoadTest.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/map/MapLoaderLoadTest.java Sat Dec 1 08:42:05 2007
@@ -137,12 +137,12 @@
assertEquals("Artist", ((Entity) queryWithOrdering.getRoot()).getName());
assertEquals(2, queryWithOrdering.getOrderings().size());
- Ordering artistNameOrdering = (Ordering) queryWithOrdering.getOrderings().get(0);
+ Ordering artistNameOrdering = queryWithOrdering.getOrderings().get(0);
assertEquals(Artist.ARTIST_NAME_PROPERTY, artistNameOrdering.getSortSpecString());
assertFalse(artistNameOrdering.isAscending());
assertTrue(artistNameOrdering.isCaseInsensitive());
- Ordering dobOrdering = (Ordering) queryWithOrdering.getOrderings().get(1);
+ Ordering dobOrdering = queryWithOrdering.getOrderings().get(1);
assertEquals(Artist.DATE_OF_BIRTH_PROPERTY, dobOrdering.getSortSpecString());
assertTrue(dobOrdering.isAscending());
assertFalse(dobOrdering.isCaseInsensitive());
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/merge/MergerFactoryTest.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/merge/MergerFactoryTest.java?rev=600160&r1=600159&r2=600160&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/merge/MergerFactoryTest.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/merge/MergerFactoryTest.java Sat Dec 1 08:42:05 2007
@@ -42,7 +42,7 @@
public void testUpToDateToDb() throws Exception {
deleteTestData();
createTestData("testArtists");
- DataNode node = (DataNode) getDomain().getDataNodes().iterator().next();
+ DataNode node = getDomain().getDataNodes().iterator().next();
DataMap map = getDomain().getMap("testmap");
filterDataMap(node, map);
@@ -52,7 +52,7 @@
public void testAddAndDropColumnToDb() throws Exception {
deleteTestData();
createTestData("testArtists");
- DataNode node = (DataNode) getDomain().getDataNodes().iterator().next();
+ DataNode node = getDomain().getDataNodes().iterator().next();
DataMap map = getDomain().getMap("testmap");
filterDataMap(node, map);
@@ -79,7 +79,7 @@
public void testChangeVarcharSizeToDb() throws Exception {
deleteTestData();
createTestData("testArtists");
- DataNode node = (DataNode) getDomain().getDataNodes().iterator().next();
+ DataNode node = getDomain().getDataNodes().iterator().next();
DataMap map = getDomain().getMap("testmap");
filterDataMap(node, map);
@@ -114,7 +114,7 @@
public void testMultipleTokensToDb() throws Exception {
deleteTestData();
createTestData("testArtists");
- DataNode node = (DataNode) getDomain().getDataNodes().iterator().next();
+ DataNode node = getDomain().getDataNodes().iterator().next();
DataMap map = getDomain().getMap("testmap");
filterDataMap(node, map);
@@ -156,7 +156,7 @@
deleteTestData();
createTestData("testArtists");
- DataNode node = (DataNode) getDomain().getDataNodes().iterator().next();
+ DataNode node = getDomain().getDataNodes().iterator().next();
DataMap map = getDomain().getMap("testmap");
filterDataMap(node, map);
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/project/DataMapProjectTest.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/project/DataMapProjectTest.java?rev=600160&r1=600159&r2=600160&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/project/DataMapProjectTest.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/project/DataMapProjectTest.java Sat Dec 1 08:42:05 2007
@@ -45,7 +45,7 @@
}
// copy shared datamap to the test location
- DataMap m = (DataMap)getNode().getDataMaps().iterator().next();
+ DataMap m = getNode().getDataMaps().iterator().next();
PrintWriter out = new PrintWriter(new FileOutputStream(f));
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/query/SelectQueryBasicsTest.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/query/SelectQueryBasicsTest.java?rev=600160&r1=600159&r2=600160&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/query/SelectQueryBasicsTest.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/query/SelectQueryBasicsTest.java Sat Dec 1 08:42:05 2007
@@ -86,7 +86,7 @@
q.addOrdering(path, Ordering.DESC);
assertEquals(1, q.getOrderings().size());
- Ordering ord = (Ordering) q.getOrderings().get(0);
+ Ordering ord = q.getOrderings().get(0);
assertEquals(path, ord.getSortSpec().getOperand(0));
assertEquals(Ordering.DESC, ord.isAscending());
}
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/CayenneCase.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/CayenneCase.java?rev=600160&r1=600159&r2=600160&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/CayenneCase.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/CayenneCase.java Sat Dec 1 08:42:05 2007
@@ -123,7 +123,7 @@
}
protected DataNode getNode() {
- return (DataNode) getDomain().getDataNodes().iterator().next();
+ return getDomain().getDataNodes().iterator().next();
}
protected DataContext createDataContext() {
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/SimpleAccessStack.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/SimpleAccessStack.java?rev=600160&r1=600159&r2=600160&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/SimpleAccessStack.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/SimpleAccessStack.java Sat Dec 1 08:42:05 2007
@@ -102,7 +102,7 @@
Iterator it = domain.getDataNodes().iterator();
while (it.hasNext()) {
DataNode node = (DataNode) it.next();
- deleteTestData(node, (DataMap) node.getDataMaps().iterator().next());
+ deleteTestData(node, node.getDataMaps().iterator().next());
}
}
@@ -111,7 +111,7 @@
Iterator it = domain.getDataNodes().iterator();
while (it.hasNext()) {
DataNode node = (DataNode) it.next();
- dropSchema(node, (DataMap) node.getDataMaps().iterator().next());
+ dropSchema(node, node.getDataMaps().iterator().next());
}
}
@@ -122,7 +122,7 @@
Iterator it = domain.getDataNodes().iterator();
while (it.hasNext()) {
DataNode node = (DataNode) it.next();
- createSchema(node, (DataMap) node.getDataMaps().iterator().next());
+ createSchema(node, node.getDataMaps().iterator().next());
}
}
@@ -130,7 +130,7 @@
Iterator it = domain.getDataNodes().iterator();
while (it.hasNext()) {
DataNode node = (DataNode) it.next();
- dropPKSupport(node, (DataMap) node.getDataMaps().iterator().next());
+ dropPKSupport(node, node.getDataMaps().iterator().next());
}
}
@@ -143,7 +143,7 @@
Iterator it = domain.getDataNodes().iterator();
while (it.hasNext()) {
DataNode node = (DataNode) it.next();
- createPKSupport(node, (DataMap) node.getDataMaps().iterator().next());
+ createPKSupport(node, node.getDataMaps().iterator().next());
}
}
}
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/TestDataDomainTest.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/TestDataDomainTest.java?rev=600160&r1=600159&r2=600160&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/TestDataDomainTest.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/TestDataDomainTest.java Sat Dec 1 08:42:05 2007
@@ -75,7 +75,7 @@
DataContext context = createDataContext();
assertSame(getDomain(), context.getParentDataDomain());
- Artist a = (Artist) context.newObject(Artist.class);
+ Artist a = context.newObject(Artist.class);
a.setArtistName("aa");
context.commitChanges();
@@ -100,9 +100,9 @@
DataContext context = createDataContext();
assertSame(getDomain(), context.getParentDataDomain());
- Painting p = (Painting) context.newObject(Painting.class);
+ Painting p = context.newObject(Painting.class);
p.setPaintingTitle("aaaa");
- PaintingInfo pi = (PaintingInfo) context.newObject(PaintingInfo.class);
+ PaintingInfo pi = context.newObject(PaintingInfo.class);
pi.setPainting(p);
context.commitChanges();
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/jira/CAY_191Test.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/jira/CAY_191Test.java?rev=600160&r1=600159&r2=600160&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/jira/CAY_191Test.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/jira/CAY_191Test.java Sat Dec 1 08:42:05 2007
@@ -34,7 +34,7 @@
createTestData("testResolveToOneOverFKOfDifferentNumType");
DataContext context = createDataContext();
- FkOfDifferentType root = (FkOfDifferentType) DataObjectUtils.objectForPK(
+ FkOfDifferentType root = DataObjectUtils.objectForPK(
context,
FkOfDifferentType.class,
1);
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/jira/CAY_194Test.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/jira/CAY_194Test.java?rev=600160&r1=600159&r2=600160&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/jira/CAY_194Test.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/jira/CAY_194Test.java Sat Dec 1 08:42:05 2007
@@ -46,14 +46,14 @@
public void testQualifyOnToMany() {
DataContext context = createDataContext();
- ReflexiveAndToOne ox = (ReflexiveAndToOne) context
+ ReflexiveAndToOne ox = context
.newObject(ReflexiveAndToOne.class);
ox.setName("ox");
- ReflexiveAndToOne o1 = (ReflexiveAndToOne) context
+ ReflexiveAndToOne o1 = context
.newObject(ReflexiveAndToOne.class);
o1.setName("o1");
- ReflexiveAndToOne o2 = (ReflexiveAndToOne) context
+ ReflexiveAndToOne o2 = context
.newObject(ReflexiveAndToOne.class);
o2.setName("o2");
o2.setToParent(o1);
@@ -76,14 +76,14 @@
public void testQualifyOnToOne() {
DataContext context = createDataContext();
- ReflexiveAndToOne ox = (ReflexiveAndToOne) context
+ ReflexiveAndToOne ox = context
.newObject(ReflexiveAndToOne.class);
ox.setName("ox");
- ReflexiveAndToOne o1 = (ReflexiveAndToOne) context
+ ReflexiveAndToOne o1 = context
.newObject(ReflexiveAndToOne.class);
o1.setName("o1");
- ReflexiveAndToOne o2 = (ReflexiveAndToOne) context
+ ReflexiveAndToOne o2 = context
.newObject(ReflexiveAndToOne.class);
o2.setName("o2");
o2.setToParent(o1);
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/jira/CAY_901Test.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/jira/CAY_901Test.java?rev=600160&r1=600159&r2=600160&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/jira/CAY_901Test.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/jira/CAY_901Test.java Sat Dec 1 08:42:05 2007
@@ -35,13 +35,13 @@
ObjectContext context = createDataContext();
- Painting p = (Painting) context.newObject(Painting.class);
+ Painting p = context.newObject(Painting.class);
p.setPaintingTitle("P1");
- Artist a = (Artist) context.newObject(Artist.class);
+ Artist a = context.newObject(Artist.class);
a.setArtistName("A1");
- Gallery g = (Gallery) context.newObject(Gallery.class);
+ Gallery g = context.newObject(Gallery.class);
g.setGalleryName("G1");
p.setToArtist(a);
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/util/DeepMergeOperationInheritanceTest.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/util/DeepMergeOperationInheritanceTest.java?rev=600160&r1=600159&r2=600160&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/util/DeepMergeOperationInheritanceTest.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/util/DeepMergeOperationInheritanceTest.java Sat Dec 1 08:42:05 2007
@@ -41,19 +41,19 @@
DataContext context = createDataContext();
DataContext context1 = createDataContext();
- Department d1 = (Department) context.newObject(Department.class);
+ Department d1 = context.newObject(Department.class);
d1.setName("D1");
// need to do double commit as Ashwood sorter blows on Employees/Departments
// ordering...
context.commitChanges();
- Employee e1 = (Employee) context.newObject(Employee.class);
+ Employee e1 = context.newObject(Employee.class);
e1.setName("E1");
e1.setPersonType("EE");
d1.addToEmployees(e1);
- Manager e2 = (Manager) context.newObject(Manager.class);
+ Manager e2 = context.newObject(Manager.class);
e2.setName("E2");
e2.setPersonType("EM");
d1.addToEmployees(e2);
@@ -98,19 +98,19 @@
DataContext context = createDataContext();
DataContext context1 = createDataContext();
- Department d1 = (Department) context.newObject(Department.class);
+ Department d1 = context.newObject(Department.class);
d1.setName("D1");
// need to do double commit as Ashwood sorter blows on Employees/Departments
// ordering...
context.commitChanges();
- Employee e1 = (Employee) context.newObject(Employee.class);
+ Employee e1 = context.newObject(Employee.class);
e1.setName("E1");
e1.setPersonType("EE");
d1.addToEmployees(e1);
- Manager e2 = (Manager) context.newObject(Manager.class);
+ Manager e2 = context.newObject(Manager.class);
e2.setName("E2");
e2.setPersonType("EM");
d1.addToEmployees(e2);
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/util/DeepMergeOperationTest.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/util/DeepMergeOperationTest.java?rev=600160&r1=600159&r2=600160&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/util/DeepMergeOperationTest.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/util/DeepMergeOperationTest.java Sat Dec 1 08:42:05 2007
@@ -36,7 +36,7 @@
DataContext context = createDataContext();
DataContext context1 = createDataContext();
- Artist a = (Artist) context.newObject(Artist.class);
+ Artist a = context.newObject(Artist.class);
a.setArtistName("AAA");
context.commitChanges();
@@ -60,7 +60,7 @@
DataContext context = createDataContext();
DataContext context1 = createDataContext();
- Artist a = (Artist) context.newObject(Artist.class);
+ Artist a = context.newObject(Artist.class);
a.setArtistName("AAA");
context.commitChanges();