258331 - JoinFetch and Private Owned widgets are missing from eclipselink-orm.xml mappings

5 files changed, 216 insertions, 8 deletions

diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/orm/details/EclipseLinkOrmManyToManyMappingUiProvider.java b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/orm/details/EclipseLinkOrmManyToManyMappingUiProvider.java
new file mode 100644
index 0000000000..f977d72abe
--- /dev/null
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/orm/details/EclipseLinkOrmManyToManyMappingUiProvider.java
@@ -0,0 +1,52 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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.
+ *
+ * Contributors:
+ *     Oracle - initial API and implementation
+ ******************************************************************************/
+package org.eclipse.jpt.eclipselink.ui.internal.orm.details;
+
+import org.eclipse.jpt.eclipselink.core.internal.context.orm.EclipseLinkOrmManyToManyMapping;
+import org.eclipse.jpt.eclipselink.ui.internal.mappings.details.EclipseLinkManyToManyMappingComposite;
+import org.eclipse.jpt.ui.JpaUiFactory;
+import org.eclipse.jpt.ui.WidgetFactory;
+import org.eclipse.jpt.ui.details.AttributeMappingUiProvider;
+import org.eclipse.jpt.ui.details.JpaComposite;
+import org.eclipse.jpt.ui.internal.details.AbstractManyToManyMappingUiProvider;
+import org.eclipse.jpt.utility.model.value.PropertyValueModel;
+import org.eclipse.swt.widgets.Composite;
+
+public class EclipseLinkOrmManyToManyMappingUiProvider
+	extends AbstractManyToManyMappingUiProvider<EclipseLinkOrmManyToManyMapping>
+{
+	// singleton
+	private static final EclipseLinkOrmManyToManyMappingUiProvider INSTANCE = 
+		new EclipseLinkOrmManyToManyMappingUiProvider();
+	
+	/**
+	 * Return the singleton.
+	 */
+	public static AttributeMappingUiProvider<EclipseLinkOrmManyToManyMapping> instance() {
+		return INSTANCE;
+	}
+	
+	
+	/**
+	 * Ensure single instance.
+	 */
+	private EclipseLinkOrmManyToManyMappingUiProvider() {
+		super();
+	}
+	
+	
+	public JpaComposite buildAttributeMappingComposite(
+			JpaUiFactory factory,
+			PropertyValueModel<EclipseLinkOrmManyToManyMapping> subjectHolder,
+			Composite parent,
+			WidgetFactory widgetFactory) {
+		return new EclipseLinkManyToManyMappingComposite(subjectHolder, parent, widgetFactory);
+	}
+}
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/orm/details/EclipseLinkOrmManyToOneMappingUiProvider.java b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/orm/details/EclipseLinkOrmManyToOneMappingUiProvider.java
new file mode 100644
index 0000000000..c909909b4e
--- /dev/null
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/orm/details/EclipseLinkOrmManyToOneMappingUiProvider.java
@@ -0,0 +1,52 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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.
+ *
+ * Contributors:
+ *     Oracle - initial API and implementation
+ ******************************************************************************/
+package org.eclipse.jpt.eclipselink.ui.internal.orm.details;
+
+import org.eclipse.jpt.eclipselink.core.internal.context.orm.EclipseLinkOrmManyToOneMapping;
+import org.eclipse.jpt.eclipselink.ui.internal.mappings.details.EclipseLinkManyToOneMappingComposite;
+import org.eclipse.jpt.ui.JpaUiFactory;
+import org.eclipse.jpt.ui.WidgetFactory;
+import org.eclipse.jpt.ui.details.AttributeMappingUiProvider;
+import org.eclipse.jpt.ui.details.JpaComposite;
+import org.eclipse.jpt.ui.internal.details.AbstractManyToOneMappingUiProvider;
+import org.eclipse.jpt.utility.model.value.PropertyValueModel;
+import org.eclipse.swt.widgets.Composite;
+
+public class EclipseLinkOrmManyToOneMappingUiProvider
+	extends AbstractManyToOneMappingUiProvider<EclipseLinkOrmManyToOneMapping>
+{
+	// singleton
+	private static final EclipseLinkOrmManyToOneMappingUiProvider INSTANCE = 
+		new EclipseLinkOrmManyToOneMappingUiProvider();
+	
+	/**
+	 * Return the singleton.
+	 */
+	public static AttributeMappingUiProvider<EclipseLinkOrmManyToOneMapping> instance() {
+		return INSTANCE;
+	}
+	
+	
+	/**
+	 * Ensure single instance.
+	 */
+	private EclipseLinkOrmManyToOneMappingUiProvider() {
+		super();
+	}
+	
+	
+	public JpaComposite buildAttributeMappingComposite(
+			JpaUiFactory factory,
+			PropertyValueModel<EclipseLinkOrmManyToOneMapping> subjectHolder,
+			Composite parent,
+			WidgetFactory widgetFactory) {
+		return new EclipseLinkManyToOneMappingComposite(subjectHolder, parent, widgetFactory);
+	}
+}
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/orm/details/EclipseLinkOrmOneToManyMappingUiProvider.java b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/orm/details/EclipseLinkOrmOneToManyMappingUiProvider.java
new file mode 100644
index 0000000000..53035ec8ab
--- /dev/null
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/orm/details/EclipseLinkOrmOneToManyMappingUiProvider.java
@@ -0,0 +1,52 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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.
+ *
+ * Contributors:
+ *     Oracle - initial API and implementation
+ ******************************************************************************/
+package org.eclipse.jpt.eclipselink.ui.internal.orm.details;
+
+import org.eclipse.jpt.eclipselink.core.internal.context.orm.EclipseLinkOrmOneToManyMapping;
+import org.eclipse.jpt.eclipselink.ui.internal.mappings.details.EclipselinkOneToManyMappingComposite;
+import org.eclipse.jpt.ui.JpaUiFactory;
+import org.eclipse.jpt.ui.WidgetFactory;
+import org.eclipse.jpt.ui.details.AttributeMappingUiProvider;
+import org.eclipse.jpt.ui.details.JpaComposite;
+import org.eclipse.jpt.ui.internal.details.AbstractOneToManyMappingUiProvider;
+import org.eclipse.jpt.utility.model.value.PropertyValueModel;
+import org.eclipse.swt.widgets.Composite;
+
+public class EclipseLinkOrmOneToManyMappingUiProvider
+	extends AbstractOneToManyMappingUiProvider<EclipseLinkOrmOneToManyMapping>
+{
+	// singleton
+	private static final EclipseLinkOrmOneToManyMappingUiProvider INSTANCE = 
+		new EclipseLinkOrmOneToManyMappingUiProvider();
+	
+	/**
+	 * Return the singleton.
+	 */
+	public static AttributeMappingUiProvider<EclipseLinkOrmOneToManyMapping> instance() {
+		return INSTANCE;
+	}
+	
+	
+	/**
+	 * Ensure single instance.
+	 */
+	private EclipseLinkOrmOneToManyMappingUiProvider() {
+		super();
+	}
+	
+	
+	public JpaComposite buildAttributeMappingComposite(
+			JpaUiFactory factory,
+			PropertyValueModel<EclipseLinkOrmOneToManyMapping> subjectHolder,
+			Composite parent,
+			WidgetFactory widgetFactory) {
+		return new EclipselinkOneToManyMappingComposite(subjectHolder, parent, widgetFactory);
+	}
+}
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/orm/details/EclipseLinkOrmOneToOneMappingUiProvider.java b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/orm/details/EclipseLinkOrmOneToOneMappingUiProvider.java
new file mode 100644
index 0000000000..3a00fb21b3
--- /dev/null
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/orm/details/EclipseLinkOrmOneToOneMappingUiProvider.java
@@ -0,0 +1,52 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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.
+ *
+ * Contributors:
+ *     Oracle - initial API and implementation
+ ******************************************************************************/
+package org.eclipse.jpt.eclipselink.ui.internal.orm.details;
+
+import org.eclipse.jpt.eclipselink.core.internal.context.orm.EclipseLinkOrmOneToOneMapping;
+import org.eclipse.jpt.eclipselink.ui.internal.mappings.details.EclipselinkOneToOneMappingComposite;
+import org.eclipse.jpt.ui.JpaUiFactory;
+import org.eclipse.jpt.ui.WidgetFactory;
+import org.eclipse.jpt.ui.details.AttributeMappingUiProvider;
+import org.eclipse.jpt.ui.details.JpaComposite;
+import org.eclipse.jpt.ui.internal.details.AbstractOneToOneMappingUiProvider;
+import org.eclipse.jpt.utility.model.value.PropertyValueModel;
+import org.eclipse.swt.widgets.Composite;
+
+public class EclipseLinkOrmOneToOneMappingUiProvider
+	extends AbstractOneToOneMappingUiProvider<EclipseLinkOrmOneToOneMapping>
+{
+	// singleton
+	private static final EclipseLinkOrmOneToOneMappingUiProvider INSTANCE = 
+		new EclipseLinkOrmOneToOneMappingUiProvider();
+	
+	/**
+	 * Return the singleton.
+	 */
+	public static AttributeMappingUiProvider<EclipseLinkOrmOneToOneMapping> instance() {
+		return INSTANCE;
+	}
+	
+	
+	/**
+	 * Ensure single instance.
+	 */
+	private EclipseLinkOrmOneToOneMappingUiProvider() {
+		super();
+	}
+	
+	
+	public JpaComposite buildAttributeMappingComposite(
+			JpaUiFactory factory,
+			PropertyValueModel<EclipseLinkOrmOneToOneMapping> subjectHolder,
+			Composite parent,
+			WidgetFactory widgetFactory) {
+		return new EclipselinkOneToOneMappingComposite(subjectHolder, parent, widgetFactory);
+	}
+}
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/platform/EclipseLinkJpaPlatformUi.java b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/platform/EclipseLinkJpaPlatformUi.java
index 711b08dc00..ecf1e62c15 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/platform/EclipseLinkJpaPlatformUi.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/platform/EclipseLinkJpaPlatformUi.java
@@ -37,7 +37,11 @@ import org.eclipse.jpt.eclipselink.ui.internal.orm.details.EclipseLinkOrmDetails
 import org.eclipse.jpt.eclipselink.ui.internal.orm.details.EclipseLinkOrmEmbeddableUiProvider;
 import org.eclipse.jpt.eclipselink.ui.internal.orm.details.EclipseLinkOrmEntityUiProvider;
 import org.eclipse.jpt.eclipselink.ui.internal.orm.details.EclipseLinkOrmIdMappingUiProvider;
+import org.eclipse.jpt.eclipselink.ui.internal.orm.details.EclipseLinkOrmManyToManyMappingUiProvider;
+import org.eclipse.jpt.eclipselink.ui.internal.orm.details.EclipseLinkOrmManyToOneMappingUiProvider;
 import org.eclipse.jpt.eclipselink.ui.internal.orm.details.EclipseLinkOrmMappedSuperclassUiProvider;
+import org.eclipse.jpt.eclipselink.ui.internal.orm.details.EclipseLinkOrmOneToManyMappingUiProvider;
+import org.eclipse.jpt.eclipselink.ui.internal.orm.details.EclipseLinkOrmOneToOneMappingUiProvider;
 import org.eclipse.jpt.eclipselink.ui.internal.orm.details.EclipseLinkOrmVersionMappingUiProvider;
 import org.eclipse.jpt.eclipselink.ui.internal.structure.EclipseLinkPersistenceResourceModelStructureProvider;
 import org.eclipse.jpt.ui.details.AttributeMappingUiProvider;
@@ -57,10 +61,6 @@ import org.eclipse.jpt.ui.internal.java.details.JavaVersionMappingUiProvider;
 import org.eclipse.jpt.ui.internal.java.details.NullAttributeMappingUiProvider;
 import org.eclipse.jpt.ui.internal.orm.details.OrmEmbeddedIdMappingUiProvider;
 import org.eclipse.jpt.ui.internal.orm.details.OrmEmbeddedMappingUiProvider;
-import org.eclipse.jpt.ui.internal.orm.details.OrmManyToManyMappingUiProvider;
-import org.eclipse.jpt.ui.internal.orm.details.OrmManyToOneMappingUiProvider;
-import org.eclipse.jpt.ui.internal.orm.details.OrmOneToManyMappingUiProvider;
-import org.eclipse.jpt.ui.internal.orm.details.OrmOneToOneMappingUiProvider;
 import org.eclipse.jpt.ui.internal.orm.details.OrmTransientMappingUiProvider;
 import org.eclipse.jpt.ui.internal.platform.base.BaseJpaPlatformUi;
 import org.eclipse.jpt.ui.internal.structure.OrmResourceModelStructureProvider;
@@ -195,10 +195,10 @@ public class EclipseLinkJpaPlatformUi extends BaseJpaPlatformUi
 			this.eclipseLinkOrmAttributeMappingUiProviders.add(EclipseLinkBasicCollectionMappingUiProvider.instance());
 			this.eclipseLinkOrmAttributeMappingUiProviders.add(EclipseLinkBasicMapMappingUiProvider.instance());
 			this.eclipseLinkOrmAttributeMappingUiProviders.add(EclipseLinkOrmVersionMappingUiProvider.instance());
-			this.eclipseLinkOrmAttributeMappingUiProviders.add(OrmManyToOneMappingUiProvider.instance());
-			this.eclipseLinkOrmAttributeMappingUiProviders.add(OrmOneToManyMappingUiProvider.instance());
-			this.eclipseLinkOrmAttributeMappingUiProviders.add(OrmOneToOneMappingUiProvider.instance());
-			this.eclipseLinkOrmAttributeMappingUiProviders.add(OrmManyToManyMappingUiProvider.instance());
+			this.eclipseLinkOrmAttributeMappingUiProviders.add(EclipseLinkOrmManyToOneMappingUiProvider.instance());
+			this.eclipseLinkOrmAttributeMappingUiProviders.add(EclipseLinkOrmOneToManyMappingUiProvider.instance());
+			this.eclipseLinkOrmAttributeMappingUiProviders.add(EclipseLinkOrmOneToOneMappingUiProvider.instance());
+			this.eclipseLinkOrmAttributeMappingUiProviders.add(EclipseLinkOrmManyToManyMappingUiProvider.instance());
 			this.eclipseLinkOrmAttributeMappingUiProviders.add(OrmEmbeddedMappingUiProvider.instance());
 			this.eclipseLinkOrmAttributeMappingUiProviders.add(EclipseLinkTransformationMappingUiProvider.instance());
 			this.eclipseLinkOrmAttributeMappingUiProviders.add(OrmTransientMappingUiProvider.instance());