309196 - only cast to JpaFactory2_0 when in a 2.0 project

3 files changed, 10 insertions, 10 deletions

diff --git a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/jpa2/context/java/GenericJavaOneToManyMapping2_0Tests.java b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/jpa2/context/java/GenericJavaOneToManyMapping2_0Tests.java
index 620232c1e6..64a72103db 100644
--- a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/jpa2/context/java/GenericJavaOneToManyMapping2_0Tests.java
+++ b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/jpa2/context/java/GenericJavaOneToManyMapping2_0Tests.java
@@ -1009,8 +1009,8 @@ public class GenericJavaOneToManyMapping2_0Tests
 		PersistentAttribute persistentAttribute = getJavaPersistentType().attributes().next();
 		OneToManyMapping2_0 oneToManyMapping = (OneToManyMapping2_0) persistentAttribute.getSpecifiedMapping();
 		oneToManyMapping.getRelationshipReference().setJoinColumnJoiningStrategy();
-		oneToManyMapping.getOrderable().setOrderColumnOrdering(true);
-		OrderColumn2_0 orderColumn = oneToManyMapping.getOrderable().getOrderColumn();
+		((Orderable2_0) oneToManyMapping.getOrderable()).setOrderColumnOrdering(true);
+		OrderColumn2_0 orderColumn = ((Orderable2_0) oneToManyMapping.getOrderable()).getOrderColumn();
 
 
 		assertNull(orderColumn.getSpecifiedName());
diff --git a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/jpa2/context/orm/GenericOrmElementCollectionMapping2_0Tests.java b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/jpa2/context/orm/GenericOrmElementCollectionMapping2_0Tests.java
index b0be836e71..384958d9cb 100644
--- a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/jpa2/context/orm/GenericOrmElementCollectionMapping2_0Tests.java
+++ b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/jpa2/context/orm/GenericOrmElementCollectionMapping2_0Tests.java
@@ -896,7 +896,7 @@ public class GenericOrmElementCollectionMapping2_0Tests extends Generic2_0Contex
 		OrmPersistentAttribute ormPersistentAttribute = ormPersistentType.addSpecifiedAttribute(MappingKeys2_0.ELEMENT_COLLECTION_ATTRIBUTE_MAPPING_KEY, "addresses");
 		OrmElementCollectionMapping2_0 elementCollectionMapping = (OrmElementCollectionMapping2_0) ormPersistentAttribute.getMapping();
 
-		Orderable2_0 orderable = elementCollectionMapping.getOrderable();
+		Orderable2_0 orderable = (Orderable2_0) elementCollectionMapping.getOrderable();
 		assertEquals(false, orderable.isOrderColumnOrdering());
 		assertEquals(true, orderable.isNoOrdering());
 		
@@ -919,7 +919,7 @@ public class GenericOrmElementCollectionMapping2_0Tests extends Generic2_0Contex
 		OrmPersistentAttribute ormPersistentAttribute = ormPersistentType.addSpecifiedAttribute(MappingKeys2_0.ELEMENT_COLLECTION_ATTRIBUTE_MAPPING_KEY, "addresses");
 		OrmElementCollectionMapping2_0 elementCollectionMapping = (OrmElementCollectionMapping2_0) ormPersistentAttribute.getMapping();
 
-		Orderable2_0 orderable = elementCollectionMapping.getOrderable();
+		Orderable2_0 orderable = (Orderable2_0) elementCollectionMapping.getOrderable();
 		assertEquals(false, orderable.isOrderColumnOrdering());
 		assertEquals(true, orderable.isNoOrdering());
 		
@@ -932,7 +932,7 @@ public class GenericOrmElementCollectionMapping2_0Tests extends Generic2_0Contex
 		ormPersistentAttribute.makeVirtual();		
 		ormPersistentAttribute = ormPersistentType.getAttributeNamed("addresses");
 		elementCollectionMapping = (OrmElementCollectionMapping2_0) ormPersistentAttribute.getMapping();
-		orderable = elementCollectionMapping.getOrderable();
+		orderable = (Orderable2_0) elementCollectionMapping.getOrderable();
 		assertEquals(true, orderable.isOrderColumnOrdering());
 		assertEquals(false, orderable.isNoOrdering());
 		assertEquals(TYPE_NAME + "_addresses", orderable.getOrderColumn().getTable());
diff --git a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/jpa2/context/orm/GenericOrmOneToManyMapping2_0Tests.java b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/jpa2/context/orm/GenericOrmOneToManyMapping2_0Tests.java
index dd0256a830..029b631e48 100644
--- a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/jpa2/context/orm/GenericOrmOneToManyMapping2_0Tests.java
+++ b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/jpa2/context/orm/GenericOrmOneToManyMapping2_0Tests.java
@@ -1091,8 +1091,8 @@ public class GenericOrmOneToManyMapping2_0Tests
 		OrmOneToManyMapping2_0 oneToManyMapping = (OrmOneToManyMapping2_0) persistentAttribute.getSpecifiedMapping();
 		JavaOneToManyMapping2_0 javaOneToManyMapping = (JavaOneToManyMapping2_0) persistentAttribute.getJavaPersistentAttribute().getSpecifiedMapping();
 		javaOneToManyMapping.getRelationshipReference().setJoinColumnJoiningStrategy();
-		javaOneToManyMapping.getOrderable().setOrderColumnOrdering(true);
-		OrderColumn2_0 orderColumn = oneToManyMapping.getOrderable().getOrderColumn();
+		((Orderable2_0) javaOneToManyMapping.getOrderable()).setOrderColumnOrdering(true);
+		OrderColumn2_0 orderColumn = ((Orderable2_0) oneToManyMapping.getOrderable()).getOrderColumn();
 
 		assertEquals("addresses_ORDER", orderColumn.getSpecifiedName());
 		assertEquals("Address", orderColumn.getTable());//target table name
@@ -1109,9 +1109,9 @@ public class GenericOrmOneToManyMapping2_0Tests
 		assertFalse(oneToManyMapping.getRelationshipReference().usesJoinColumnJoiningStrategy());
 
 		oneToManyMapping.getRelationshipReference().setJoinColumnJoiningStrategy();
-		assertFalse(oneToManyMapping.getOrderable().isOrderColumnOrdering());
-		oneToManyMapping.getOrderable().setOrderColumnOrdering(true);
-		orderColumn = oneToManyMapping.getOrderable().getOrderColumn();
+		assertFalse(((Orderable2_0) oneToManyMapping.getOrderable()).isOrderColumnOrdering());
+		((Orderable2_0) oneToManyMapping.getOrderable()).setOrderColumnOrdering(true);
+		orderColumn = ((Orderable2_0) oneToManyMapping.getOrderable()).getOrderColumn();
 
 		assertNull(orderColumn.getSpecifiedName());
 		assertEquals("addresses_ORDER", orderColumn.getName());