309056 - Access annotation support was added in EclipseLink 1.2, not 1.1

9 files changed, 50 insertions, 51 deletions

diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/META-INF/MANIFEST.MF b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/META-INF/MANIFEST.MF
index faadfcb842..cb8ee7dcda 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/META-INF/MANIFEST.MF
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/META-INF/MANIFEST.MF
@@ -40,9 +40,9 @@ Export-Package: org.eclipse.jpt.eclipselink.ui,
  org.eclipse.jpt.eclipselink.ui.internal.persistencexml.details;x-internal:=true,
  org.eclipse.jpt.eclipselink.ui.internal.platform;x-internal:=true,
  org.eclipse.jpt.eclipselink.ui.internal.structure;x-internal:=true,
- org.eclipse.jpt.eclipselink.ui.internal.v1_1.details.java;x-internal:=true,
  org.eclipse.jpt.eclipselink.ui.internal.v1_1.details.orm;x-internal:=true,
  org.eclipse.jpt.eclipselink.ui.internal.v1_1.platform;x-internal:=true,
+ org.eclipse.jpt.eclipselink.ui.internal.v1_2.details.java;x-internal:=true,
  org.eclipse.jpt.eclipselink.ui.internal.v1_2.details.orm;x-internal:=true,
  org.eclipse.jpt.eclipselink.ui.internal.v1_2.platform;x-internal:=true,
  org.eclipse.jpt.eclipselink.ui.internal.v2_0.ddlgen.wizards;x-internal:=true,
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/v1_1/platform/EclipseLink1_1JpaPlatformUiProvider.java b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/v1_1/platform/EclipseLink1_1JpaPlatformUiProvider.java
index abe022d2eb..41892666a3 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/v1_1/platform/EclipseLink1_1JpaPlatformUiProvider.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/v1_1/platform/EclipseLink1_1JpaPlatformUiProvider.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2007, 2009 Oracle. All rights reserved.
+ * Copyright (c) 2007, 2010 Oracle. All rights reserved.
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0, which accompanies this distribution
  * and is available at http://www.eclipse.org/legal/epl-v10.html.
@@ -10,10 +10,10 @@
 package org.eclipse.jpt.eclipselink.ui.internal.v1_1.platform;
 
 import java.util.List;
+import org.eclipse.jpt.eclipselink.ui.internal.details.java.EclipseLinkJavaResourceUiDefinition;
 import org.eclipse.jpt.eclipselink.ui.internal.details.orm.EclipseLinkEntityMappingsDetailsProvider;
 import org.eclipse.jpt.eclipselink.ui.internal.details.orm.EclipseLinkOrmXmlUiDefinition;
 import org.eclipse.jpt.eclipselink.ui.internal.persistence.EclipseLinkPersistenceXmlUiDefinition;
-import org.eclipse.jpt.eclipselink.ui.internal.v1_1.details.java.EclipseLink1_1JavaResourceUiDefinition;
 import org.eclipse.jpt.eclipselink.ui.internal.v1_1.details.orm.EclipseLinkOrmXml1_1UiDefinition;
 import org.eclipse.jpt.ui.JpaPlatformUiProvider;
 import org.eclipse.jpt.ui.ResourceUiDefinition;
@@ -64,7 +64,7 @@ public class EclipseLink1_1JpaPlatformUiProvider extends AbstractJpaPlatformUiPr
 	
 	@Override
 	protected void addResourceUiDefinitionsTo(List<ResourceUiDefinition> definitions) {
-		definitions.add(EclipseLink1_1JavaResourceUiDefinition.instance());
+		definitions.add(EclipseLinkJavaResourceUiDefinition.instance());
 		definitions.add(OrmXmlUiDefinition.instance());
 		definitions.add(EclipseLinkOrmXmlUiDefinition.instance());
 		definitions.add(EclipseLinkOrmXml1_1UiDefinition.instance());
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/v1_1/details/java/EclipseLink1_1JavaResourceUiDefinition.java b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/v1_2/details/java/EclipseLink1_2JavaResourceUiDefinition.java
index bbee914b3c..37b0e1ab53 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/v1_1/details/java/EclipseLink1_1JavaResourceUiDefinition.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/v1_2/details/java/EclipseLink1_2JavaResourceUiDefinition.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2009 Oracle. All rights reserved.
+ * Copyright (c) 2009, 2010 Oracle. All rights reserved.
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0, which accompanies this distribution
  * and is available at http://www.eclipse.org/legal/epl-v10.html.
@@ -7,7 +7,7 @@
  * Contributors:
  *     Oracle - initial API and implementation
  ******************************************************************************/
-package org.eclipse.jpt.eclipselink.ui.internal.v1_1.details.java;
+package org.eclipse.jpt.eclipselink.ui.internal.v1_2.details.java;
 
 import java.util.List;
 import org.eclipse.jpt.core.context.AttributeMapping;
@@ -42,10 +42,10 @@ import org.eclipse.jpt.ui.internal.details.java.JavaTransientMappingUiDefinition
 import org.eclipse.jpt.ui.internal.details.java.JavaVersionMappingUiDefinition;
 import org.eclipse.jpt.ui.internal.details.java.NullJavaAttributeMappingUiDefinition;
 
-public class EclipseLink1_1JavaResourceUiDefinition extends AbstractJavaResourceUiDefinition
+public class EclipseLink1_2JavaResourceUiDefinition extends AbstractJavaResourceUiDefinition
 {
 	// singleton
-	private static final ResourceUiDefinition INSTANCE = new EclipseLink1_1JavaResourceUiDefinition();
+	private static final ResourceUiDefinition INSTANCE = new EclipseLink1_2JavaResourceUiDefinition();
 
 	/**
 	 * Return the singleton.
@@ -53,20 +53,20 @@ public class EclipseLink1_1JavaResourceUiDefinition extends AbstractJavaResource
 	public static ResourceUiDefinition instance() {
 		return INSTANCE;
 	}
-	
-	
+
+
 	/**
 	 * zero-argument constructor
 	 */
-	protected EclipseLink1_1JavaResourceUiDefinition() {
+	protected EclipseLink1_2JavaResourceUiDefinition() {
 		super();
 	}
-	
+
 	@Override
 	protected JavaUiFactory buildJavaUiFactory() {
-		return new EclipseLink1_1JavaUiFactory();
+		return new EclipseLink1_2JavaUiFactory();
 	}
-	
+
 	@Override
 	protected void addSpecifiedAttributeMappingUiDefinitionsTo(List<JavaAttributeMappingUiDefinition<? extends AttributeMapping>> definitions) {
 		definitions.add(JavaIdMappingUiDefinition.instance());
@@ -84,7 +84,7 @@ public class EclipseLink1_1JavaResourceUiDefinition extends AbstractJavaResource
 		definitions.add(JavaEclipseLinkVariableOneToOneMappingUiDefinition.instance());
 		definitions.add(JavaEclipseLinkTransformationMappingUiDefinition.instance());
 	}
-	
+
 	@Override
 	protected void addDefaultAttributeMappingUiDefinitionsTo(List<DefaultJavaAttributeMappingUiDefinition<?>> definitions) {
 		definitions.add(DefaultBasicMappingUiDefinition.instance());
@@ -94,7 +94,7 @@ public class EclipseLink1_1JavaResourceUiDefinition extends AbstractJavaResource
 		definitions.add(DefaultJavaEclipseLinkOneToManyMappingUiDefinition.instance());
 		definitions.add(DefaultJavaEclipseLinkVariableOneToOneMappingUiDefinition.instance());
 	}
-	
+
 	@Override
 	protected void addSpecifiedTypeMappingUiDefinitionsTo(List<JavaTypeMappingUiDefinition<? extends TypeMapping>> definitions) {
 		definitions.add(JavaEntityUiDefinition.instance());
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/v1_1/details/java/EclipseLink1_1JavaUiFactory.java b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/v1_2/details/java/EclipseLink1_2JavaUiFactory.java
index bb441bec1c..77f2534c85 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/v1_1/details/java/EclipseLink1_1JavaUiFactory.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/v1_2/details/java/EclipseLink1_2JavaUiFactory.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2009 Oracle. All rights reserved.
+ * Copyright (c) 2009, 2010 Oracle. All rights reserved.
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0, which accompanies this distribution
  * and is available at http://www.eclipse.org/legal/epl-v10.html.
@@ -7,48 +7,47 @@
  * Contributors:
  *     Oracle - initial API and implementation
  *******************************************************************************/
-package org.eclipse.jpt.eclipselink.ui.internal.v1_1.details.java;
+package org.eclipse.jpt.eclipselink.ui.internal.v1_2.details.java;
 
 import org.eclipse.jpt.core.context.java.JavaEmbeddable;
 import org.eclipse.jpt.core.context.java.JavaEntity;
 import org.eclipse.jpt.core.context.java.JavaMappedSuperclass;
 import org.eclipse.jpt.eclipselink.ui.internal.details.java.EclipseLinkJavaUiFactory;
-import org.eclipse.jpt.eclipselink.ui.internal.v1_1.details.java.JavaEclipseLinkEmbeddable1_1Composite;
-import org.eclipse.jpt.eclipselink.ui.internal.v1_1.details.java.JavaEclipseLinkEntity1_1Composite;
-import org.eclipse.jpt.eclipselink.ui.internal.v1_1.details.java.JavaEclipseLinkMappedSuperclass1_1Composite;
+import org.eclipse.jpt.eclipselink.ui.internal.v1_2.details.java.JavaEclipseLinkEmbeddable1_2Composite;
+import org.eclipse.jpt.eclipselink.ui.internal.v1_2.details.java.JavaEclipseLinkEntity1_2Composite;
+import org.eclipse.jpt.eclipselink.ui.internal.v1_2.details.java.JavaEclipseLinkMappedSuperclass1_2Composite;
 import org.eclipse.jpt.ui.WidgetFactory;
 import org.eclipse.jpt.ui.details.JpaComposite;
 import org.eclipse.jpt.utility.model.value.PropertyValueModel;
 import org.eclipse.swt.widgets.Composite;
 
-public class EclipseLink1_1JavaUiFactory extends EclipseLinkJavaUiFactory
+public class EclipseLink1_2JavaUiFactory extends EclipseLinkJavaUiFactory
 {
-	public EclipseLink1_1JavaUiFactory() {
+	public EclipseLink1_2JavaUiFactory() {
 		super();
 	}
-	
-	
-	
+
+
 	// **************** java type mapping composites ***************************
-	
+
 	@Override
 	public JpaComposite createJavaMappedSuperclassComposite(
 			PropertyValueModel<JavaMappedSuperclass> subjectHolder,
 			Composite parent, WidgetFactory widgetFactory) {
-		return new JavaEclipseLinkMappedSuperclass1_1Composite(subjectHolder, parent, widgetFactory);
+		return new JavaEclipseLinkMappedSuperclass1_2Composite(subjectHolder, parent, widgetFactory);
 	}
-	
+
 	@Override
 	public JpaComposite createJavaEntityComposite(
 			PropertyValueModel<JavaEntity> subjectHolder,
 			Composite parent, WidgetFactory widgetFactory) {
-		return new JavaEclipseLinkEntity1_1Composite(subjectHolder, parent, widgetFactory);
+		return new JavaEclipseLinkEntity1_2Composite(subjectHolder, parent, widgetFactory);
 	}
-	
+
 	@Override
 	public JpaComposite createJavaEmbeddableComposite(
 			PropertyValueModel<JavaEmbeddable> subjectHolder,
 			Composite parent, WidgetFactory widgetFactory) {
-		return new JavaEclipseLinkEmbeddable1_1Composite(subjectHolder, parent, widgetFactory);
+		return new JavaEclipseLinkEmbeddable1_2Composite(subjectHolder, parent, widgetFactory);
 	}
 }
\ No newline at end of file
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/v1_1/details/java/JavaEclipseLinkEmbeddable1_1Composite.java b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/v1_2/details/java/JavaEclipseLinkEmbeddable1_2Composite.java
index c6d4cc5d8a..26a4c0a569 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/v1_1/details/java/JavaEclipseLinkEmbeddable1_1Composite.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/v1_2/details/java/JavaEclipseLinkEmbeddable1_2Composite.java
@@ -7,7 +7,7 @@
  * Contributors:
  *     Oracle - initial API and implementation
  ******************************************************************************/
-package org.eclipse.jpt.eclipselink.ui.internal.v1_1.details.java;
+package org.eclipse.jpt.eclipselink.ui.internal.v1_2.details.java;
 
 import org.eclipse.jpt.core.context.AccessHolder;
 import org.eclipse.jpt.core.context.java.JavaEmbeddable;
@@ -28,7 +28,7 @@ import org.eclipse.swt.widgets.Composite;
  * @version 2.3
  * @since 2.1
  */
-public class JavaEclipseLinkEmbeddable1_1Composite extends AbstractJavaEclipseLinkEmbeddableComposite
+public class JavaEclipseLinkEmbeddable1_2Composite extends AbstractJavaEclipseLinkEmbeddableComposite
 {
 	/**
 	 * Creates a new <code>EmbeddableComposite</code>.
@@ -37,7 +37,7 @@ public class JavaEclipseLinkEmbeddable1_1Composite extends AbstractJavaEclipseLi
 	 * @param parent The parent container
 	 * @param widgetFactory The factory used to create various common widgets
 	 */
-	public JavaEclipseLinkEmbeddable1_1Composite(PropertyValueModel<? extends JavaEmbeddable> subjectHolder,
+	public JavaEclipseLinkEmbeddable1_2Composite(PropertyValueModel<? extends JavaEmbeddable> subjectHolder,
 	                           Composite parent,
 	                           WidgetFactory widgetFactory) {
 
@@ -50,12 +50,12 @@ public class JavaEclipseLinkEmbeddable1_1Composite extends AbstractJavaEclipseLi
 		this.initializeConvertersCollapsibleSection(container);
 		this.initializeAdvancedCollapsibleSection(container);
 	}
-	
+
 	@Override
 	protected void initializeEmbeddableSection(Composite container) {
 		new AccessTypeComposite(this, buildAccessHolder(), container);	
 	}
-	
+
 	protected PropertyValueModel<AccessHolder> buildAccessHolder() {
 		return new PropertyAspectAdapter<JavaEmbeddable, AccessHolder>(
 			getSubjectHolder())
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/v1_1/details/java/JavaEclipseLinkEntity1_1Composite.java b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/v1_2/details/java/JavaEclipseLinkEntity1_2Composite.java
index 63ac8a3e4e..81d541a717 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/v1_1/details/java/JavaEclipseLinkEntity1_1Composite.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/v1_2/details/java/JavaEclipseLinkEntity1_2Composite.java
@@ -7,7 +7,7 @@
  * Contributors:
  *     Oracle - initial API and implementation
  ******************************************************************************/
-package org.eclipse.jpt.eclipselink.ui.internal.v1_1.details.java;
+package org.eclipse.jpt.eclipselink.ui.internal.v1_2.details.java;
 
 import org.eclipse.jpt.core.context.AccessHolder;
 import org.eclipse.jpt.core.context.java.JavaEntity;
@@ -23,7 +23,7 @@ import org.eclipse.jpt.utility.model.value.PropertyValueModel;
 import org.eclipse.swt.widgets.Composite;
 
 /**
- * The pane used for an EclipseLink1.1 Java entity.
+ * The pane used for an EclipseLink1.2 Java entity.
  *
  * @see JavaEclipseLinkEntity
  * @see EclipselinkJpaUiFactory - The factory creating this pane
@@ -31,7 +31,7 @@ import org.eclipse.swt.widgets.Composite;
  * @version 2.3
  * @since 2.2
  */
-public class JavaEclipseLinkEntity1_1Composite
+public class JavaEclipseLinkEntity1_2Composite
 	extends AbstractJavaEclipseLinkEntityComposite<JavaEntity>
 {
 	/**
@@ -41,14 +41,14 @@ public class JavaEclipseLinkEntity1_1Composite
 	 * @param parent The parent container
 	 * @param widgetFactory The factory used to create various common widgets
 	 */
-	public JavaEclipseLinkEntity1_1Composite(
+	public JavaEclipseLinkEntity1_2Composite(
 			PropertyValueModel<? extends JavaEntity> subjectHolder,
 			Composite parent,
 			WidgetFactory widgetFactory) {
-		
+
 		super(subjectHolder, parent, widgetFactory);
 	}
-	
+
 	@Override
 	protected void initializeEntitySection(Composite container) {
 		new TableComposite(this, container);
@@ -56,7 +56,7 @@ public class JavaEclipseLinkEntity1_1Composite
 		new AccessTypeComposite(this, buildAccessHolder(), container);	
 		new IdClassComposite(this, buildIdClassReferenceHolder(), container);
 	}
-	
+
 	protected PropertyValueModel<AccessHolder> buildAccessHolder() {
 		return new PropertyAspectAdapter<JavaEntity, AccessHolder>(getSubjectHolder()) {
 			@Override
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/v1_1/details/java/JavaEclipseLinkMappedSuperclass1_1Composite.java b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/v1_2/details/java/JavaEclipseLinkMappedSuperclass1_2Composite.java
index 750e4a1f3a..6f6737d3af 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/v1_1/details/java/JavaEclipseLinkMappedSuperclass1_1Composite.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/v1_2/details/java/JavaEclipseLinkMappedSuperclass1_2Composite.java
@@ -7,7 +7,7 @@
  * Contributors:
  *     Oracle - initial API and implementation
  ******************************************************************************/
-package org.eclipse.jpt.eclipselink.ui.internal.v1_1.details.java;
+package org.eclipse.jpt.eclipselink.ui.internal.v1_2.details.java;
 
 import org.eclipse.jpt.core.context.AccessHolder;
 import org.eclipse.jpt.core.context.java.JavaMappedSuperclass;
@@ -29,7 +29,7 @@ import org.eclipse.swt.widgets.Composite;
  * @version 2.3
  * @since 2.1
  */
-public class JavaEclipseLinkMappedSuperclass1_1Composite
+public class JavaEclipseLinkMappedSuperclass1_2Composite
 	extends AbstractJavaEclipseLinkMappedSuperclassComposite
 {
 	/**
@@ -39,7 +39,7 @@ public class JavaEclipseLinkMappedSuperclass1_1Composite
 	 * @param parent The parent container
 	 * @param widgetFactory The factory used to create various common widgets
 	 */
-	public JavaEclipseLinkMappedSuperclass1_1Composite(
+	public JavaEclipseLinkMappedSuperclass1_2Composite(
 			PropertyValueModel<? extends JavaMappedSuperclass> subjectHolder,
 			Composite parent,
 			WidgetFactory widgetFactory) {
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/v1_2/platform/EclipseLink1_2JpaPlatformUiProvider.java b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/v1_2/platform/EclipseLink1_2JpaPlatformUiProvider.java
index 319a698649..f7d80e891c 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/v1_2/platform/EclipseLink1_2JpaPlatformUiProvider.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/v1_2/platform/EclipseLink1_2JpaPlatformUiProvider.java
@@ -13,8 +13,8 @@ import java.util.List;
 import org.eclipse.jpt.eclipselink.ui.internal.details.orm.EclipseLinkEntityMappingsDetailsProvider;
 import org.eclipse.jpt.eclipselink.ui.internal.details.orm.EclipseLinkOrmXmlUiDefinition;
 import org.eclipse.jpt.eclipselink.ui.internal.persistence.EclipseLinkPersistenceXmlUiDefinition;
-import org.eclipse.jpt.eclipselink.ui.internal.v1_1.details.java.EclipseLink1_1JavaResourceUiDefinition;
 import org.eclipse.jpt.eclipselink.ui.internal.v1_1.details.orm.EclipseLinkOrmXml1_1UiDefinition;
+import org.eclipse.jpt.eclipselink.ui.internal.v1_2.details.java.EclipseLink1_2JavaResourceUiDefinition;
 import org.eclipse.jpt.eclipselink.ui.internal.v1_2.details.orm.EclipseLinkOrmXml1_2UiDefinition;
 import org.eclipse.jpt.ui.JpaPlatformUiProvider;
 import org.eclipse.jpt.ui.ResourceUiDefinition;
@@ -65,7 +65,7 @@ public class EclipseLink1_2JpaPlatformUiProvider extends AbstractJpaPlatformUiPr
 	
 	@Override
 	protected void addResourceUiDefinitionsTo(List<ResourceUiDefinition> definitions) {
-		definitions.add(EclipseLink1_1JavaResourceUiDefinition.instance());
+		definitions.add(EclipseLink1_2JavaResourceUiDefinition.instance());
 		definitions.add(OrmXmlUiDefinition.instance());
 		definitions.add(EclipseLinkOrmXmlUiDefinition.instance());
 		definitions.add(EclipseLinkOrmXml1_1UiDefinition.instance());
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/v2_0/details/java/EclipseLink2_0JavaUiFactory.java b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/v2_0/details/java/EclipseLink2_0JavaUiFactory.java
index 7af4b36e07..6bb29fcad2 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/v2_0/details/java/EclipseLink2_0JavaUiFactory.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/v2_0/details/java/EclipseLink2_0JavaUiFactory.java
@@ -18,7 +18,7 @@ import org.eclipse.jpt.core.context.java.JavaMappedSuperclass;
 import org.eclipse.jpt.core.context.java.JavaOneToManyMapping;
 import org.eclipse.jpt.core.context.java.JavaOneToOneMapping;
 import org.eclipse.jpt.core.jpa2.context.java.JavaElementCollectionMapping2_0;
-import org.eclipse.jpt.eclipselink.ui.internal.v1_1.details.java.EclipseLink1_1JavaUiFactory;
+import org.eclipse.jpt.eclipselink.ui.internal.v1_2.details.java.EclipseLink1_2JavaUiFactory;
 import org.eclipse.jpt.ui.WidgetFactory;
 import org.eclipse.jpt.ui.details.JpaComposite;
 import org.eclipse.jpt.ui.internal.jpa2.details.ElementCollectionMapping2_0Composite;
@@ -31,7 +31,7 @@ import org.eclipse.swt.widgets.Composite;
  *  EclipseLink2_0JpaUiFactory
  */
 public class EclipseLink2_0JavaUiFactory
-	extends EclipseLink1_1JavaUiFactory
+	extends EclipseLink1_2JavaUiFactory
 	implements JavaUiFactory2_0
 {
 	public EclipseLink2_0JavaUiFactory() {