Refactored packages into public API, renamed interfaces

22 files changed, 1066 insertions, 123 deletions

diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/java/details/BasicMappingUiProvider.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/java/details/BasicMappingUiProvider.java
new file mode 100644
index 0000000000..763ff48dad
--- /dev/null
+++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/java/details/BasicMappingUiProvider.java
@@ -0,0 +1,59 @@
+/*******************************************************************************
+ * Copyright (c) 2006, 2007 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.ui.internal.java.details;
+
+import org.eclipse.jpt.core.MappingKeys;
+import org.eclipse.jpt.core.context.BasicMapping;
+import org.eclipse.jpt.ui.JpaUiFactory;
+import org.eclipse.jpt.ui.details.JpaComposite;
+import org.eclipse.jpt.ui.internal.mappings.JptUiMappingsMessages;
+import org.eclipse.jpt.ui.java.details.AttributeMappingUiProvider;
+import org.eclipse.jpt.utility.internal.model.value.PropertyValueModel;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetWidgetFactory;
+
+public class BasicMappingUiProvider
+	implements AttributeMappingUiProvider<BasicMapping>
+{
+
+	// singleton
+	private static final BasicMappingUiProvider INSTANCE = new BasicMappingUiProvider();
+
+	/**
+	 * Return the singleton.
+	 */
+	public static AttributeMappingUiProvider<BasicMapping> instance() {
+		return INSTANCE;
+	}
+
+	/**
+	 * Ensure non-instantiability.
+	 */
+	private BasicMappingUiProvider() {
+		super();
+	}
+
+	public String attributeMappingKey() {
+		return MappingKeys.BASIC_ATTRIBUTE_MAPPING_KEY;
+	}
+
+	public String label() {
+		return JptUiMappingsMessages.PersistentAttributePage_BasicLabel;
+	}
+
+	public JpaComposite<BasicMapping> buildAttributeMappingComposite(
+			JpaUiFactory factory,
+			PropertyValueModel<BasicMapping> subjectHolder,
+			Composite parent,
+			TabbedPropertySheetWidgetFactory widgetFactory) {
+
+		return factory.createBasicMappingComposite(subjectHolder, parent, widgetFactory);
+	}
+}
\ No newline at end of file
diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/java/details/DefaultBasicMappingUiProvider.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/java/details/DefaultBasicMappingUiProvider.java
new file mode 100644
index 0000000000..be7deef6df
--- /dev/null
+++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/java/details/DefaultBasicMappingUiProvider.java
@@ -0,0 +1,61 @@
+/*******************************************************************************
+ * Copyright (c) 2006, 2007 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.ui.internal.java.details;
+
+import org.eclipse.jpt.core.MappingKeys;
+import org.eclipse.jpt.core.context.BasicMapping;
+import org.eclipse.jpt.ui.JpaUiFactory;
+import org.eclipse.jpt.ui.details.JpaComposite;
+import org.eclipse.jpt.ui.internal.mappings.JptUiMappingsMessages;
+import org.eclipse.jpt.ui.java.details.AttributeMappingUiProvider;
+import org.eclipse.jpt.utility.internal.model.value.PropertyValueModel;
+import org.eclipse.osgi.util.NLS;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetWidgetFactory;
+
+public class DefaultBasicMappingUiProvider
+	implements AttributeMappingUiProvider<BasicMapping>
+{
+	// singleton
+	private static final DefaultBasicMappingUiProvider INSTANCE = new DefaultBasicMappingUiProvider();
+
+	/**
+	 * Return the singleton.
+	 */
+	public static AttributeMappingUiProvider<BasicMapping> instance() {
+		return INSTANCE;
+	}
+
+	/**
+	 * Ensure non-instantiability.
+	 */
+	private DefaultBasicMappingUiProvider() {
+		super();
+	}
+
+	public String attributeMappingKey() {
+		return MappingKeys.BASIC_ATTRIBUTE_MAPPING_KEY;
+	}
+
+	public String label() {
+		return NLS.bind(
+			JptUiMappingsMessages.DefaultBasicMappingUiProvider_Default,
+			JptUiMappingsMessages.PersistentAttributePage_BasicLabel
+		);
+	}
+
+	public JpaComposite<BasicMapping> buildAttributeMappingComposite(JpaUiFactory factory,
+			PropertyValueModel<BasicMapping> subjectHolder,
+			Composite parent,
+			TabbedPropertySheetWidgetFactory widgetFactory) {
+
+		return factory.createBasicMappingComposite(subjectHolder, parent, widgetFactory);
+	}
+}
diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/java/details/DefaultEmbeddedMappingUiProvider.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/java/details/DefaultEmbeddedMappingUiProvider.java
new file mode 100644
index 0000000000..31b898c15c
--- /dev/null
+++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/java/details/DefaultEmbeddedMappingUiProvider.java
@@ -0,0 +1,62 @@
+/*******************************************************************************
+ * Copyright (c) 2006, 2007 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.ui.internal.java.details;
+
+import org.eclipse.jpt.core.MappingKeys;
+import org.eclipse.jpt.core.context.EmbeddedMapping;
+import org.eclipse.jpt.ui.JpaUiFactory;
+import org.eclipse.jpt.ui.details.JpaComposite;
+import org.eclipse.jpt.ui.internal.mappings.JptUiMappingsMessages;
+import org.eclipse.jpt.ui.java.details.AttributeMappingUiProvider;
+import org.eclipse.jpt.utility.internal.model.value.PropertyValueModel;
+import org.eclipse.osgi.util.NLS;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetWidgetFactory;
+
+public class DefaultEmbeddedMappingUiProvider
+	implements AttributeMappingUiProvider<EmbeddedMapping>
+{
+	// singleton
+	private static final DefaultEmbeddedMappingUiProvider INSTANCE = new DefaultEmbeddedMappingUiProvider();
+
+	/**
+	 * Return the singleton.
+	 */
+	public static AttributeMappingUiProvider<EmbeddedMapping> instance() {
+		return INSTANCE;
+	}
+
+	/**
+	 * Ensure non-instantiability.
+	 */
+	private DefaultEmbeddedMappingUiProvider() {
+		super();
+	}
+
+	public String attributeMappingKey() {
+		return MappingKeys.EMBEDDED_ATTRIBUTE_MAPPING_KEY;
+	}
+
+	public String label() {
+		return NLS.bind(
+			JptUiMappingsMessages.DefaultEmbeddedMappingUiProvider_Default,
+			JptUiMappingsMessages.PersistentAttributePage_EmbeddedLabel
+		);
+	}
+
+	public JpaComposite<EmbeddedMapping> buildAttributeMappingComposite(
+			JpaUiFactory factory,
+			PropertyValueModel<EmbeddedMapping> subjectHolder,
+			Composite parent,
+			TabbedPropertySheetWidgetFactory widgetFactory) {
+
+		return factory.createEmbeddedMappingComposite(subjectHolder, parent, widgetFactory);
+	}
+}
diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/java/details/EmbeddableUiProvider.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/java/details/EmbeddableUiProvider.java
new file mode 100644
index 0000000000..92308434c9
--- /dev/null
+++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/java/details/EmbeddableUiProvider.java
@@ -0,0 +1,56 @@
+/*******************************************************************************
+ * Copyright (c) 2007 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.ui.internal.java.details;
+
+import org.eclipse.jpt.core.MappingKeys;
+import org.eclipse.jpt.core.context.Embeddable;
+import org.eclipse.jpt.ui.details.JpaComposite;
+import org.eclipse.jpt.ui.internal.mappings.JptUiMappingsMessages;
+import org.eclipse.jpt.ui.internal.mappings.details.EmbeddableComposite;
+import org.eclipse.jpt.ui.java.details.TypeMappingUiProvider;
+import org.eclipse.jpt.utility.internal.model.value.PropertyValueModel;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetWidgetFactory;
+
+public class EmbeddableUiProvider implements TypeMappingUiProvider<Embeddable>
+{
+	// singleton
+	private static final EmbeddableUiProvider INSTANCE = new EmbeddableUiProvider();
+
+	/**
+	 * Return the singleton.
+	 */
+	public static TypeMappingUiProvider<Embeddable> instance() {
+		return INSTANCE;
+	}
+
+	/**
+	 * Ensure non-instantiability.
+	 */
+	private EmbeddableUiProvider() {
+		super();
+	}
+
+	public String mappingKey() {
+		return MappingKeys.EMBEDDABLE_TYPE_MAPPING_KEY;
+	}
+
+	public String label() {
+		return JptUiMappingsMessages.PersistentTypePage_EmbeddableLabel;
+	}
+
+	public JpaComposite<Embeddable> buildPersistentTypeMappingComposite(
+			PropertyValueModel<Embeddable> subjectHolder,
+			Composite parent,
+			TabbedPropertySheetWidgetFactory widgetFactory) {
+
+		return new EmbeddableComposite(subjectHolder, parent, widgetFactory);
+	}
+}
\ No newline at end of file
diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/java/details/EmbeddedIdMappingUiProvider.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/java/details/EmbeddedIdMappingUiProvider.java
new file mode 100644
index 0000000000..2d9ceb7fd4
--- /dev/null
+++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/java/details/EmbeddedIdMappingUiProvider.java
@@ -0,0 +1,59 @@
+/*******************************************************************************
+ * Copyright (c) 2007 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.ui.internal.java.details;
+
+import org.eclipse.jpt.core.MappingKeys;
+import org.eclipse.jpt.core.context.EmbeddedIdMapping;
+import org.eclipse.jpt.ui.JpaUiFactory;
+import org.eclipse.jpt.ui.details.JpaComposite;
+import org.eclipse.jpt.ui.internal.mappings.JptUiMappingsMessages;
+import org.eclipse.jpt.ui.java.details.AttributeMappingUiProvider;
+import org.eclipse.jpt.utility.internal.model.value.PropertyValueModel;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetWidgetFactory;
+
+public class EmbeddedIdMappingUiProvider
+	implements AttributeMappingUiProvider<EmbeddedIdMapping>
+{
+
+	// singleton
+	private static final EmbeddedIdMappingUiProvider INSTANCE = new EmbeddedIdMappingUiProvider();
+
+	/**
+	 * Return the singleton.
+	 */
+	public static AttributeMappingUiProvider<EmbeddedIdMapping> instance() {
+		return INSTANCE;
+	}
+
+	/**
+	 * Ensure non-instantiability.
+	 */
+	private EmbeddedIdMappingUiProvider() {
+		super();
+	}
+
+	public String attributeMappingKey() {
+		return MappingKeys.EMBEDDED_ID_ATTRIBUTE_MAPPING_KEY;
+	}
+
+	public String label() {
+		return JptUiMappingsMessages.PersistentAttributePage_EmbeddedIdLabel;
+	}
+
+	public JpaComposite<EmbeddedIdMapping> buildAttributeMappingComposite(
+			JpaUiFactory factory,
+			PropertyValueModel<EmbeddedIdMapping> subjectHolder,
+			Composite parent,
+			TabbedPropertySheetWidgetFactory widgetFactory) {
+
+		return factory.createEmbeddedIdMappingComposite(subjectHolder, parent, widgetFactory);
+	}
+}
\ No newline at end of file
diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/java/details/EmbeddedMappingUiProvider.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/java/details/EmbeddedMappingUiProvider.java
new file mode 100644
index 0000000000..f660954422
--- /dev/null
+++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/java/details/EmbeddedMappingUiProvider.java
@@ -0,0 +1,59 @@
+/*******************************************************************************
+ * Copyright (c) 2007 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.ui.internal.java.details;
+
+import org.eclipse.jpt.core.MappingKeys;
+import org.eclipse.jpt.core.context.EmbeddedMapping;
+import org.eclipse.jpt.ui.JpaUiFactory;
+import org.eclipse.jpt.ui.details.JpaComposite;
+import org.eclipse.jpt.ui.internal.mappings.JptUiMappingsMessages;
+import org.eclipse.jpt.ui.java.details.AttributeMappingUiProvider;
+import org.eclipse.jpt.utility.internal.model.value.PropertyValueModel;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetWidgetFactory;
+
+public class EmbeddedMappingUiProvider
+	implements AttributeMappingUiProvider<EmbeddedMapping>
+{
+
+	// singleton
+	private static final EmbeddedMappingUiProvider INSTANCE = new EmbeddedMappingUiProvider();
+
+	/**
+	 * Return the singleton.
+	 */
+	public static AttributeMappingUiProvider<EmbeddedMapping> instance() {
+		return INSTANCE;
+	}
+
+	/**
+	 * Ensure non-instantiability.
+	 */
+	private EmbeddedMappingUiProvider() {
+		super();
+	}
+
+	public String attributeMappingKey() {
+		return MappingKeys.EMBEDDED_ATTRIBUTE_MAPPING_KEY;
+	}
+
+	public String label() {
+		return JptUiMappingsMessages.PersistentAttributePage_EmbeddedLabel;
+	}
+
+	public JpaComposite<EmbeddedMapping> buildAttributeMappingComposite(
+			JpaUiFactory factory,
+			PropertyValueModel<EmbeddedMapping> subjectHolder,
+			Composite parent,
+			TabbedPropertySheetWidgetFactory widgetFactory) {
+
+		return factory.createEmbeddedMappingComposite(subjectHolder, parent, widgetFactory);
+	}
+}
\ No newline at end of file
diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/java/details/EntityUiProvider.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/java/details/EntityUiProvider.java
new file mode 100644
index 0000000000..b3a9ab698c
--- /dev/null
+++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/java/details/EntityUiProvider.java
@@ -0,0 +1,56 @@
+/*******************************************************************************
+ * Copyright (c) 2006, 2007 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.ui.internal.java.details;
+
+import org.eclipse.jpt.core.MappingKeys;
+import org.eclipse.jpt.core.context.Entity;
+import org.eclipse.jpt.ui.details.JpaComposite;
+import org.eclipse.jpt.ui.internal.mappings.JptUiMappingsMessages;
+import org.eclipse.jpt.ui.internal.mappings.details.EntityComposite;
+import org.eclipse.jpt.ui.java.details.TypeMappingUiProvider;
+import org.eclipse.jpt.utility.internal.model.value.PropertyValueModel;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetWidgetFactory;
+
+public class EntityUiProvider implements TypeMappingUiProvider<Entity>
+{
+	// singleton
+	private static final EntityUiProvider INSTANCE = new EntityUiProvider();
+
+	/**
+	 * Return the singleton.
+	 */
+	public static TypeMappingUiProvider<Entity> instance() {
+		return INSTANCE;
+	}
+
+	/**
+	 * Ensure non-instantiability.
+	 */
+	private EntityUiProvider() {
+		super();
+	}
+
+	public String mappingKey() {
+		return MappingKeys.ENTITY_TYPE_MAPPING_KEY;
+	}
+
+	public String label() {
+		return JptUiMappingsMessages.PersistentTypePage_EntityLabel;
+	}
+
+	public JpaComposite<Entity> buildPersistentTypeMappingComposite(
+			PropertyValueModel<Entity> subjectHolder,
+			Composite parent,
+			TabbedPropertySheetWidgetFactory widgetFactory) {
+
+		return new EntityComposite(subjectHolder, parent, widgetFactory);
+	}
+}
diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/java/details/IAttributeMappingUiProvider.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/java/details/IAttributeMappingUiProvider.java
deleted file mode 100644
index c3960c40a4..0000000000
--- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/java/details/IAttributeMappingUiProvider.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2007 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.ui.internal.java.details;
-
-import org.eclipse.jpt.core.internal.context.base.IAttributeMapping;
-import org.eclipse.jpt.ui.internal.IJpaUiFactory;
-import org.eclipse.jpt.ui.internal.details.IJpaComposite;
-import org.eclipse.jpt.utility.internal.model.value.PropertyValueModel;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetWidgetFactory;
-
-public interface IAttributeMappingUiProvider<T extends IAttributeMapping>
-{
-	/**
-	 * A unique string that corresponds to the key of a MappingProvider in the core
-	 * (IJavaAttributeMappingProvider and/or IXmlAttributeMappingProvider)
-	 */
-	String attributeMappingKey();
-
-	/**
-	 * The IJpaComposite that correponds to this mapping type.  This will be displayed
-	 * by the PersistentAttributeDetailsPage when the mapping key matches the key given
-	 * by this provider.  The composites will be stored in a Map with the mapping key as the key.
-	 * @param factory
-	 * @param parent
-	 * @param widgetFactory
-	 *
-	 * @return
-	 */
-	IJpaComposite<T> buildAttributeMappingComposite(
-			IJpaUiFactory factory,
-			PropertyValueModel<T> subjectHolder,
-			Composite parent,
-			TabbedPropertySheetWidgetFactory widgetFactory);
-
-	/**
-	 * A label to be displayed to the label as an option in the mapping type combo box
-	 * @return
-	 */
-	String label();
-}
\ No newline at end of file
diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/java/details/ITypeMappingUiProvider.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/java/details/ITypeMappingUiProvider.java
deleted file mode 100644
index b97cba51cf..0000000000
--- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/java/details/ITypeMappingUiProvider.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2007 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.ui.internal.java.details;
-
-import org.eclipse.jpt.core.internal.context.base.ITypeMapping;
-import org.eclipse.jpt.ui.internal.details.IJpaComposite;
-import org.eclipse.jpt.utility.internal.model.value.PropertyValueModel;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetWidgetFactory;
-
-public interface ITypeMappingUiProvider<T extends ITypeMapping>
-{
-	/**
-	 * A unique string that corresponds to the key of a MappingProvider in the core
-	 */
-	String mappingKey();
-
-	/**
-	 * A label to be displayed to the label as an option in the mapping type combo box
-	 * @return
-	 */
-	String label();
-
-	/**
-	 * The IJpaComposite that correponds to this mapping type.  This will be displayed
-	 * by the PersistentTypeDetailsPage when the mapping key matches the key given
-	 * by this provider.  The composites will be stored in a Map with the mapping key as the key.
-	 *
-	 * @param parent
-	 * @param widgetFactory
-	 * @return
-	 */
-	IJpaComposite<T> buildPersistentTypeMappingComposite(
-			PropertyValueModel<T> subjectHolder,
-			Composite parent,
-			TabbedPropertySheetWidgetFactory widgetFactory);
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/java/details/IdMappingUiProvider.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/java/details/IdMappingUiProvider.java
new file mode 100644
index 0000000000..ab1799e492
--- /dev/null
+++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/java/details/IdMappingUiProvider.java
@@ -0,0 +1,58 @@
+/*******************************************************************************
+ * Copyright (c) 2006, 2007 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.ui.internal.java.details;
+
+import org.eclipse.jpt.core.MappingKeys;
+import org.eclipse.jpt.core.context.IdMapping;
+import org.eclipse.jpt.ui.JpaUiFactory;
+import org.eclipse.jpt.ui.details.JpaComposite;
+import org.eclipse.jpt.ui.internal.mappings.JptUiMappingsMessages;
+import org.eclipse.jpt.ui.java.details.AttributeMappingUiProvider;
+import org.eclipse.jpt.utility.internal.model.value.PropertyValueModel;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetWidgetFactory;
+
+public class IdMappingUiProvider
+	implements AttributeMappingUiProvider<IdMapping>
+{
+	// singleton
+	private static final IdMappingUiProvider INSTANCE = new IdMappingUiProvider();
+
+	/**
+	 * Return the singleton.
+	 */
+	public static AttributeMappingUiProvider<IdMapping> instance() {
+		return INSTANCE;
+	}
+
+	/**
+	 * Ensure non-instantiability.
+	 */
+	private IdMappingUiProvider() {
+		super();
+	}
+
+	public String attributeMappingKey() {
+		return MappingKeys.ID_ATTRIBUTE_MAPPING_KEY;
+	}
+
+	public String label() {
+		return JptUiMappingsMessages.PersistentAttributePage_IdLabel;
+	}
+
+	public JpaComposite<IdMapping> buildAttributeMappingComposite(
+			JpaUiFactory factory,
+			PropertyValueModel<IdMapping> subjectHolder,
+			Composite parent,
+			TabbedPropertySheetWidgetFactory widgetFactory) {
+
+		return factory.createIdMappingComposite(subjectHolder, parent, widgetFactory);
+	}
+}
diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/java/details/JavaDetailsProvider.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/java/details/JavaDetailsProvider.java
index 3d9ac6eb23..39dc3c5ea1 100644
--- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/java/details/JavaDetailsProvider.java
+++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/java/details/JavaDetailsProvider.java
@@ -9,10 +9,10 @@
  ******************************************************************************/
 package org.eclipse.jpt.ui.internal.java.details;
 
-import org.eclipse.jpt.core.internal.IJpaStructureNode;
-import org.eclipse.jpt.core.internal.context.java.IJavaStructureNodes;
-import org.eclipse.jpt.ui.internal.details.IJpaDetailsPage;
-import org.eclipse.jpt.ui.internal.details.IJpaDetailsProvider;
+import org.eclipse.jpt.core.JpaStructureNode;
+import org.eclipse.jpt.core.context.java.JavaStructureNodes;
+import org.eclipse.jpt.ui.details.JpaDetailsPage;
+import org.eclipse.jpt.ui.details.JpaDetailsProvider;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetWidgetFactory;
 
@@ -24,7 +24,7 @@ import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetWidgetFactory;
  * @since 1.0
  */
 public class JavaDetailsProvider
-	implements IJpaDetailsProvider
+	implements JpaDetailsProvider
 {
 	/**
 	 * Creates a new <code>JavaDetailsProvider</code>.
@@ -36,16 +36,16 @@ public class JavaDetailsProvider
 	/*
 	 * (non-Javadoc)
 	 */
-	public IJpaDetailsPage<? extends IJpaStructureNode> buildDetailsPage(
+	public JpaDetailsPage<? extends JpaStructureNode> buildDetailsPage(
 		Composite parent,
 		Object contentNodeId,
 		TabbedPropertySheetWidgetFactory widgetFactory) {
 
-		if (contentNodeId == IJavaStructureNodes.PERSISTENT_TYPE_ID) {
+		if (contentNodeId == JavaStructureNodes.PERSISTENT_TYPE_ID) {
 			return new JavaPersistentTypeDetailsPage(parent, widgetFactory);
 		}
 
-		if (contentNodeId == IJavaStructureNodes.PERSISTENT_ATTRIBUTE_ID) {
+		if (contentNodeId == JavaStructureNodes.PERSISTENT_ATTRIBUTE_ID) {
 			return new JavaPersistentAttributeDetailsPage(parent, widgetFactory);
 		}
 
diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/java/details/JavaPersistentAttributeDetailsPage.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/java/details/JavaPersistentAttributeDetailsPage.java
index 06da38a93b..1167a7fcb5 100644
--- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/java/details/JavaPersistentAttributeDetailsPage.java
+++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/java/details/JavaPersistentAttributeDetailsPage.java
@@ -10,12 +10,12 @@
 package org.eclipse.jpt.ui.internal.java.details;
 
 import java.util.ListIterator;
-import org.eclipse.jpt.core.internal.context.base.IAttributeMapping;
-import org.eclipse.jpt.core.internal.context.base.IPersistentAttribute;
-import org.eclipse.jpt.core.internal.context.java.IJavaPersistentAttribute;
+import org.eclipse.jpt.core.context.AttributeMapping;
+import org.eclipse.jpt.core.context.PersistentAttribute;
+import org.eclipse.jpt.core.context.java.JavaPersistentAttribute;
 import org.eclipse.jpt.ui.internal.details.PersistentAttributeDetailsPage;
-import org.eclipse.jpt.ui.internal.java.mappings.properties.NullAttributeMappingUiProvider;
 import org.eclipse.jpt.ui.internal.platform.base.BaseJpaPlatformUi;
+import org.eclipse.jpt.ui.java.details.AttributeMappingUiProvider;
 import org.eclipse.jpt.utility.internal.CollectionTools;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.layout.GridData;
@@ -27,12 +27,12 @@ import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetWidgetFactory;
  * The default implementation of the details page used for the Java persistent
  * attribute.
  *
- * @see IPersistentAttribute
+ * @see PersistentAttribute
  *
  * @version 2.0
  * @since 2.0
  */
-public class JavaPersistentAttributeDetailsPage extends PersistentAttributeDetailsPage<IJavaPersistentAttribute>
+public class JavaPersistentAttributeDetailsPage extends PersistentAttributeDetailsPage<JavaPersistentAttribute>
 {
 	/**
 	 * Creates a new <code>JavaPersistentAttributeDetailsPage</code>.
@@ -50,7 +50,7 @@ public class JavaPersistentAttributeDetailsPage extends PersistentAttributeDetai
 	 * (non-Javadoc)
 	 */
 	@Override
-	protected ListIterator<IAttributeMappingUiProvider<? extends IAttributeMapping>> attributeMappingUiProviders() {
+	protected ListIterator<AttributeMappingUiProvider<? extends AttributeMapping>> attributeMappingUiProviders() {
 		// TODO
 		return ((BaseJpaPlatformUi) jpaPlatformUi()).javaAttributeMappingUiProviders();
 	}
@@ -63,11 +63,11 @@ public class JavaPersistentAttributeDetailsPage extends PersistentAttributeDetai
 	 * determined by matching its key with the key of the current attributeMapping.
 	 */
 	@Override
-	protected IAttributeMappingUiProvider<? extends IAttributeMapping>[] attributeMappingUiProvidersFor(IPersistentAttribute persistentAttribute) {
-		IAttributeMappingUiProvider<? extends IAttributeMapping>[] providers = new IAttributeMappingUiProvider<?>[CollectionTools.size(attributeMappingUiProviders()) + 1];
+	protected AttributeMappingUiProvider<? extends AttributeMapping>[] attributeMappingUiProvidersFor(PersistentAttribute persistentAttribute) {
+		AttributeMappingUiProvider<? extends AttributeMapping>[] providers = new AttributeMappingUiProvider<?>[CollectionTools.size(attributeMappingUiProviders()) + 1];
 		providers[0] =  defaultAttributeMappingUiProvider(persistentAttribute.defaultMappingKey());
 		int i = 1;
-		for (ListIterator<IAttributeMappingUiProvider<? extends IAttributeMapping>> iterator = attributeMappingUiProviders(); iterator.hasNext(); ) {
+		for (ListIterator<AttributeMappingUiProvider<? extends AttributeMapping>> iterator = attributeMappingUiProviders(); iterator.hasNext(); ) {
 			providers[i++] = iterator.next();
 		}
 		return providers;
@@ -77,9 +77,9 @@ public class JavaPersistentAttributeDetailsPage extends PersistentAttributeDetai
 	 * (non-Javadoc)
 	 */
 	@Override
-	protected IAttributeMappingUiProvider<? extends IAttributeMapping> defaultAttributeMappingUiProvider(String key) {
-		for (ListIterator<IAttributeMappingUiProvider<? extends IAttributeMapping>> i = defaultAttributeMappingUiProviders(); i.hasNext(); ) {
-			IAttributeMappingUiProvider<? extends IAttributeMapping> provider = i.next();
+	protected AttributeMappingUiProvider<? extends AttributeMapping> defaultAttributeMappingUiProvider(String key) {
+		for (ListIterator<AttributeMappingUiProvider<? extends AttributeMapping>> i = defaultAttributeMappingUiProviders(); i.hasNext(); ) {
+			AttributeMappingUiProvider<? extends AttributeMapping> provider = i.next();
 			if (provider.attributeMappingKey() == key) {
 				return provider;
 			}
@@ -91,7 +91,7 @@ public class JavaPersistentAttributeDetailsPage extends PersistentAttributeDetai
 	 * (non-Javadoc)
 	 */
 	@Override
-	protected ListIterator<IAttributeMappingUiProvider<? extends IAttributeMapping>> defaultAttributeMappingUiProviders() {
+	protected ListIterator<AttributeMappingUiProvider<? extends AttributeMapping>> defaultAttributeMappingUiProviders() {
 		// TODO
 //		return jpaPlatformUi().defaultJavaAttributeMappingUiProviders();
 		return ((BaseJpaPlatformUi) jpaPlatformUi()).defaultJavaAttributeMappingUiProviders();
@@ -122,7 +122,7 @@ public class JavaPersistentAttributeDetailsPage extends PersistentAttributeDetai
 		mappingPane.setLayoutData(gridData);
 	}
 
-	protected IAttributeMappingUiProvider<IAttributeMapping> nullAttributeMappingUiProvider() {
+	protected AttributeMappingUiProvider<AttributeMapping> nullAttributeMappingUiProvider() {
 		return NullAttributeMappingUiProvider.instance();
 	}
 }
\ No newline at end of file
diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/java/details/JavaPersistentTypeDetailsPage.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/java/details/JavaPersistentTypeDetailsPage.java
index c4237bffe5..a887137d6d 100644
--- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/java/details/JavaPersistentTypeDetailsPage.java
+++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/java/details/JavaPersistentTypeDetailsPage.java
@@ -10,12 +10,13 @@
 package org.eclipse.jpt.ui.internal.java.details;
 
 import java.util.ListIterator;
-import org.eclipse.jpt.core.internal.context.base.ITypeMapping;
-import org.eclipse.jpt.core.internal.context.java.IJavaPersistentType;
-import org.eclipse.jpt.ui.internal.IJpaPlatformUi;
+import org.eclipse.jpt.core.context.TypeMapping;
+import org.eclipse.jpt.core.context.java.JavaPersistentType;
+import org.eclipse.jpt.ui.JpaPlatformUi;
 import org.eclipse.jpt.ui.internal.details.PersistentTypeDetailsPage;
 import org.eclipse.jpt.ui.internal.platform.JpaPlatformUiRegistry;
 import org.eclipse.jpt.ui.internal.platform.base.BaseJpaPlatformUi;
+import org.eclipse.jpt.ui.java.details.TypeMappingUiProvider;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.widgets.Composite;
@@ -26,12 +27,12 @@ import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetWidgetFactory;
  * The default implementation of the details page used for the Java persistent
  * type.
  *
- * @see IJavaPersistentType
+ * @see JavaPersistentType
  *
  * @version 2.0
  * @since 2.0
  */
-public class JavaPersistentTypeDetailsPage extends PersistentTypeDetailsPage<IJavaPersistentType>
+public class JavaPersistentTypeDetailsPage extends PersistentTypeDetailsPage<JavaPersistentType>
 {
 	/**
 	 * Creates a new <code>JavaPersistentTypeDetailsPage</code>.
@@ -45,7 +46,7 @@ public class JavaPersistentTypeDetailsPage extends PersistentTypeDetailsPage<IJa
 		super(parent, widgetFactory);
 	}
 
-	protected IJpaPlatformUi jpaPlatformUi() {
+	protected JpaPlatformUi jpaPlatformUi() {
 		String platformId = subject().jpaProject().jpaPlatform().getId();
 		return JpaPlatformUiRegistry.instance().jpaPlatform(platformId);
 	}
@@ -54,7 +55,7 @@ public class JavaPersistentTypeDetailsPage extends PersistentTypeDetailsPage<IJa
 	 * (non-Javadoc)
 	 */
 	@Override
-	protected ListIterator<ITypeMappingUiProvider<? extends ITypeMapping>> typeMappingUiProviders() {
+	protected ListIterator<TypeMappingUiProvider<? extends TypeMapping>> typeMappingUiProviders() {
 		// TODO
 		return ((BaseJpaPlatformUi) jpaPlatformUi()).javaTypeMappingUiProviders();
 	}
diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/java/details/ManyToManyMappingUiProvider.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/java/details/ManyToManyMappingUiProvider.java
new file mode 100644
index 0000000000..f4719aed7a
--- /dev/null
+++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/java/details/ManyToManyMappingUiProvider.java
@@ -0,0 +1,58 @@
+/*******************************************************************************
+ * Copyright (c) 2006, 2007 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.ui.internal.java.details;
+
+import org.eclipse.jpt.core.MappingKeys;
+import org.eclipse.jpt.core.context.ManyToManyMapping;
+import org.eclipse.jpt.ui.JpaUiFactory;
+import org.eclipse.jpt.ui.details.JpaComposite;
+import org.eclipse.jpt.ui.internal.mappings.JptUiMappingsMessages;
+import org.eclipse.jpt.ui.java.details.AttributeMappingUiProvider;
+import org.eclipse.jpt.utility.internal.model.value.PropertyValueModel;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetWidgetFactory;
+
+public class ManyToManyMappingUiProvider
+	implements AttributeMappingUiProvider<ManyToManyMapping>
+{
+	// singleton
+	private static final ManyToManyMappingUiProvider INSTANCE = new ManyToManyMappingUiProvider();
+
+	/**
+	 * Return the singleton.
+	 */
+	public static AttributeMappingUiProvider<ManyToManyMapping> instance() {
+		return INSTANCE;
+	}
+
+	/**
+	 * Ensure non-instantiability.
+	 */
+	private ManyToManyMappingUiProvider() {
+		super();
+	}
+
+	public String attributeMappingKey() {
+		return MappingKeys.MANY_TO_MANY_ATTRIBUTE_MAPPING_KEY;
+	}
+
+	public String label() {
+		return JptUiMappingsMessages.PersistentAttributePage_ManyToManyLabel;
+	}
+
+	public JpaComposite<ManyToManyMapping> buildAttributeMappingComposite(
+			JpaUiFactory factory,
+			PropertyValueModel<ManyToManyMapping> subjectHolder,
+			Composite parent,
+			TabbedPropertySheetWidgetFactory widgetFactory) {
+
+		return factory.createManyToManyMappingComposite(subjectHolder, parent, widgetFactory);
+	}
+}
diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/java/details/ManyToOneMappingUiProvider.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/java/details/ManyToOneMappingUiProvider.java
new file mode 100644
index 0000000000..d1b9408a09
--- /dev/null
+++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/java/details/ManyToOneMappingUiProvider.java
@@ -0,0 +1,58 @@
+/*******************************************************************************
+ * Copyright (c) 2006, 2007 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.ui.internal.java.details;
+
+import org.eclipse.jpt.core.MappingKeys;
+import org.eclipse.jpt.core.context.ManyToOneMapping;
+import org.eclipse.jpt.ui.JpaUiFactory;
+import org.eclipse.jpt.ui.details.JpaComposite;
+import org.eclipse.jpt.ui.internal.mappings.JptUiMappingsMessages;
+import org.eclipse.jpt.ui.java.details.AttributeMappingUiProvider;
+import org.eclipse.jpt.utility.internal.model.value.PropertyValueModel;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetWidgetFactory;
+
+public class ManyToOneMappingUiProvider
+	implements AttributeMappingUiProvider<ManyToOneMapping>
+{
+	// singleton
+	private static final ManyToOneMappingUiProvider INSTANCE = new ManyToOneMappingUiProvider();
+
+	/**
+	 * Return the singleton.
+	 */
+	public static AttributeMappingUiProvider<ManyToOneMapping> instance() {
+		return INSTANCE;
+	}
+
+	/**
+	 * Ensure non-instantiability.
+	 */
+	private ManyToOneMappingUiProvider() {
+		super();
+	}
+
+	public String attributeMappingKey() {
+		return MappingKeys.MANY_TO_ONE_ATTRIBUTE_MAPPING_KEY;
+	}
+
+	public String label() {
+		return JptUiMappingsMessages.PersistentAttributePage_ManyToOneLabel;
+	}
+
+	public JpaComposite<ManyToOneMapping> buildAttributeMappingComposite(
+			JpaUiFactory factory,
+			PropertyValueModel<ManyToOneMapping> subjectHolder,
+			Composite parent,
+			TabbedPropertySheetWidgetFactory widgetFactory) {
+
+		return factory.createManyToOneMappingComposite(subjectHolder, parent, widgetFactory);
+	}
+}
diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/java/details/MappedSuperclassUiProvider.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/java/details/MappedSuperclassUiProvider.java
new file mode 100644
index 0000000000..c95b85158d
--- /dev/null
+++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/java/details/MappedSuperclassUiProvider.java
@@ -0,0 +1,56 @@
+/*******************************************************************************
+ * Copyright (c) 2006, 2007 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.ui.internal.java.details;
+
+import org.eclipse.jpt.core.MappingKeys;
+import org.eclipse.jpt.core.context.MappedSuperclass;
+import org.eclipse.jpt.ui.details.JpaComposite;
+import org.eclipse.jpt.ui.internal.mappings.JptUiMappingsMessages;
+import org.eclipse.jpt.ui.internal.mappings.details.MappedSuperclassComposite;
+import org.eclipse.jpt.ui.java.details.TypeMappingUiProvider;
+import org.eclipse.jpt.utility.internal.model.value.PropertyValueModel;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetWidgetFactory;
+
+public class MappedSuperclassUiProvider implements TypeMappingUiProvider<MappedSuperclass>
+{
+	// singleton
+	private static final MappedSuperclassUiProvider INSTANCE = new MappedSuperclassUiProvider();
+
+	/**
+	 * Return the singleton.
+	 */
+	public static TypeMappingUiProvider<MappedSuperclass> instance() {
+		return INSTANCE;
+	}
+
+	/**
+	 * Ensure non-instantiability.
+	 */
+	private MappedSuperclassUiProvider() {
+		super();
+	}
+
+	public String mappingKey() {
+		return MappingKeys.MAPPED_SUPERCLASS_TYPE_MAPPING_KEY;
+	}
+
+	public String label() {
+		return JptUiMappingsMessages.PersistentTypePage_MappedSuperclassLabel;
+	}
+
+	public JpaComposite<MappedSuperclass> buildPersistentTypeMappingComposite(
+			PropertyValueModel<MappedSuperclass> subjectHolder,
+			Composite parent,
+			TabbedPropertySheetWidgetFactory widgetFactory) {
+
+		return new MappedSuperclassComposite(subjectHolder, parent, widgetFactory);
+	}
+}
diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/java/details/NullAttributeMappingUiProvider.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/java/details/NullAttributeMappingUiProvider.java
new file mode 100644
index 0000000000..1cd0a2e800
--- /dev/null
+++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/java/details/NullAttributeMappingUiProvider.java
@@ -0,0 +1,87 @@
+/*******************************************************************************
+ * Copyright (c) 2006, 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.ui.internal.java.details;
+
+import org.eclipse.jpt.core.context.AttributeMapping;
+import org.eclipse.jpt.ui.JpaUiFactory;
+import org.eclipse.jpt.ui.details.JpaComposite;
+import org.eclipse.jpt.ui.internal.widgets.AbstractFormPane;
+import org.eclipse.jpt.ui.java.details.AttributeMappingUiProvider;
+import org.eclipse.jpt.utility.internal.model.value.PropertyValueModel;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetWidgetFactory;
+
+@SuppressWarnings("nls")
+public class NullAttributeMappingUiProvider
+	implements AttributeMappingUiProvider<AttributeMapping>
+{
+
+	// singleton
+	private static final NullAttributeMappingUiProvider INSTANCE = new NullAttributeMappingUiProvider();
+
+	/**
+	 * Return the singleton.
+	 */
+	public static AttributeMappingUiProvider<AttributeMapping> instance() {
+		return INSTANCE;
+	}
+
+	/**
+	 * Ensure non-instantiability.
+	 */
+	private NullAttributeMappingUiProvider() {
+		super();
+	}
+
+
+	/*
+	 * (non-Javadoc)
+	 */
+	public String attributeMappingKey() {
+		return null;
+	}
+
+	/*
+	 * (non-Javadoc)
+	 */
+	public String label() {
+		return "";
+	}
+
+	/*
+	 * (non-Javadoc)
+	 */
+	public JpaComposite<AttributeMapping> buildAttributeMappingComposite(
+			JpaUiFactory factory,
+			PropertyValueModel<AttributeMapping> subjectHolder,
+			Composite parent,
+			TabbedPropertySheetWidgetFactory widgetFactory) {
+
+		return new NullComposite(subjectHolder, parent, widgetFactory);
+	}
+
+	public static class NullComposite extends AbstractFormPane<AttributeMapping>
+	                                  implements JpaComposite<AttributeMapping>{
+
+		NullComposite(PropertyValueModel<AttributeMapping> subjectHolder,
+		              Composite parent,
+		              TabbedPropertySheetWidgetFactory widgetFactory) {
+
+			super(subjectHolder, parent, widgetFactory);
+		}
+
+		/*
+		 * (non-Javadoc)
+		 */
+		@Override
+		protected void initializeLayout(Composite container) {
+		}
+	}
+}
\ No newline at end of file
diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/java/details/NullTypeMappingUiProvider.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/java/details/NullTypeMappingUiProvider.java
new file mode 100644
index 0000000000..b4e84a19a2
--- /dev/null
+++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/java/details/NullTypeMappingUiProvider.java
@@ -0,0 +1,71 @@
+/*******************************************************************************
+ * Copyright (c) 2006, 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.ui.internal.java.details;
+
+import org.eclipse.jpt.core.context.TypeMapping;
+import org.eclipse.jpt.ui.details.JpaComposite;
+import org.eclipse.jpt.ui.internal.widgets.AbstractFormPane;
+import org.eclipse.jpt.ui.java.details.TypeMappingUiProvider;
+import org.eclipse.jpt.utility.internal.model.value.PropertyValueModel;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetWidgetFactory;
+
+@SuppressWarnings("nls")
+public class NullTypeMappingUiProvider implements TypeMappingUiProvider<TypeMapping>
+{
+	// singleton
+	private static final NullTypeMappingUiProvider INSTANCE = new NullTypeMappingUiProvider();
+
+	/**
+	 * Return the singleton.
+	 */
+	public static TypeMappingUiProvider<TypeMapping> instance() {
+		return INSTANCE;
+	}
+
+	/**
+	 * Ensure non-instantiability.
+	 */
+	private NullTypeMappingUiProvider() {
+		super();
+	}
+
+	public String mappingKey() {
+		return null;
+	}
+
+	public String label() {
+		return "";
+	}
+
+	public JpaComposite<TypeMapping> buildPersistentTypeMappingComposite(
+			PropertyValueModel<TypeMapping> subjectHolder,
+			Composite parent,
+			TabbedPropertySheetWidgetFactory widgetFactory) {
+
+		return new NullComposite(subjectHolder, parent, widgetFactory);
+	}
+
+
+	public static class NullComposite extends AbstractFormPane<TypeMapping>
+	                                  implements JpaComposite<TypeMapping>
+	{
+		NullComposite(PropertyValueModel<TypeMapping> subjectHolder,
+		              Composite parent,
+		              TabbedPropertySheetWidgetFactory widgetFactory) {
+
+			super(subjectHolder, parent, widgetFactory);
+		}
+
+		@Override
+		protected void initializeLayout(Composite container) {
+		}
+	}
+}
\ No newline at end of file
diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/java/details/OneToManyMappingUiProvider.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/java/details/OneToManyMappingUiProvider.java
new file mode 100644
index 0000000000..587110e544
--- /dev/null
+++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/java/details/OneToManyMappingUiProvider.java
@@ -0,0 +1,58 @@
+/*******************************************************************************
+ * Copyright (c) 2006, 2007 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.ui.internal.java.details;
+
+import org.eclipse.jpt.core.MappingKeys;
+import org.eclipse.jpt.core.context.OneToManyMapping;
+import org.eclipse.jpt.ui.JpaUiFactory;
+import org.eclipse.jpt.ui.details.JpaComposite;
+import org.eclipse.jpt.ui.internal.mappings.JptUiMappingsMessages;
+import org.eclipse.jpt.ui.java.details.AttributeMappingUiProvider;
+import org.eclipse.jpt.utility.internal.model.value.PropertyValueModel;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetWidgetFactory;
+
+public class OneToManyMappingUiProvider
+	implements AttributeMappingUiProvider<OneToManyMapping>
+{
+	// singleton
+	private static final OneToManyMappingUiProvider INSTANCE = new OneToManyMappingUiProvider();
+
+	/**
+	 * Return the singleton.
+	 */
+	public static AttributeMappingUiProvider<OneToManyMapping> instance() {
+		return INSTANCE;
+	}
+
+	/**
+	 * Ensure non-instantiability.
+	 */
+	private OneToManyMappingUiProvider() {
+		super();
+	}
+
+	public String attributeMappingKey() {
+		return MappingKeys.ONE_TO_MANY_ATTRIBUTE_MAPPING_KEY;
+	}
+
+	public String label() {
+		return JptUiMappingsMessages.PersistentAttributePage_OneToManyLabel;
+	}
+
+	public JpaComposite<OneToManyMapping> buildAttributeMappingComposite(
+			JpaUiFactory factory,
+			PropertyValueModel<OneToManyMapping> subjectHolder,
+			Composite parent,
+			TabbedPropertySheetWidgetFactory widgetFactory) {
+
+		return factory.createOneToManyMappingComposite(subjectHolder, parent, widgetFactory);
+	}
+}
diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/java/details/OneToOneMappingUiProvider.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/java/details/OneToOneMappingUiProvider.java
new file mode 100644
index 0000000000..85fe2da2ed
--- /dev/null
+++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/java/details/OneToOneMappingUiProvider.java
@@ -0,0 +1,59 @@
+/*******************************************************************************
+ * Copyright (c) 2007 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.ui.internal.java.details;
+
+import org.eclipse.jpt.core.MappingKeys;
+import org.eclipse.jpt.core.context.OneToOneMapping;
+import org.eclipse.jpt.ui.JpaUiFactory;
+import org.eclipse.jpt.ui.details.JpaComposite;
+import org.eclipse.jpt.ui.internal.mappings.JptUiMappingsMessages;
+import org.eclipse.jpt.ui.java.details.AttributeMappingUiProvider;
+import org.eclipse.jpt.utility.internal.model.value.PropertyValueModel;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetWidgetFactory;
+
+public class OneToOneMappingUiProvider
+	implements AttributeMappingUiProvider<OneToOneMapping>
+{
+
+	// singleton
+	private static final OneToOneMappingUiProvider INSTANCE = new OneToOneMappingUiProvider();
+
+	/**
+	 * Return the singleton.
+	 */
+	public static AttributeMappingUiProvider<OneToOneMapping> instance() {
+		return INSTANCE;
+	}
+
+	/**
+	 * Ensure non-instantiability.
+	 */
+	private OneToOneMappingUiProvider() {
+		super();
+	}
+
+	public String attributeMappingKey() {
+		return MappingKeys.ONE_TO_ONE_ATTRIBUTE_MAPPING_KEY;
+	}
+
+	public String label() {
+		return JptUiMappingsMessages.PersistentAttributePage_OneToOneLabel;
+	}
+
+	public JpaComposite<OneToOneMapping> buildAttributeMappingComposite(
+			JpaUiFactory factory,
+			PropertyValueModel<OneToOneMapping> subjectHolder,
+			Composite parent,
+			TabbedPropertySheetWidgetFactory widgetFactory) {
+
+		return factory.createOneToOneMappingComposite(subjectHolder, parent, widgetFactory);
+	}
+}
\ No newline at end of file
diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/java/details/TransientMappingUiProvider.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/java/details/TransientMappingUiProvider.java
new file mode 100644
index 0000000000..31f48791d9
--- /dev/null
+++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/java/details/TransientMappingUiProvider.java
@@ -0,0 +1,59 @@
+/*******************************************************************************
+ * Copyright (c) 2007 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.ui.internal.java.details;
+
+import org.eclipse.jpt.core.MappingKeys;
+import org.eclipse.jpt.core.context.TransientMapping;
+import org.eclipse.jpt.ui.JpaUiFactory;
+import org.eclipse.jpt.ui.details.JpaComposite;
+import org.eclipse.jpt.ui.internal.mappings.JptUiMappingsMessages;
+import org.eclipse.jpt.ui.java.details.AttributeMappingUiProvider;
+import org.eclipse.jpt.utility.internal.model.value.PropertyValueModel;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetWidgetFactory;
+
+public class TransientMappingUiProvider
+	implements AttributeMappingUiProvider<TransientMapping>
+{
+
+	// singleton
+	private static final TransientMappingUiProvider INSTANCE = new TransientMappingUiProvider();
+
+	/**
+	 * Return the singleton.
+	 */
+	public static AttributeMappingUiProvider<TransientMapping> instance() {
+		return INSTANCE;
+	}
+
+	/**
+	 * Ensure non-instantiability.
+	 */
+	private TransientMappingUiProvider() {
+		super();
+	}
+
+	public String attributeMappingKey() {
+		return MappingKeys.TRANSIENT_ATTRIBUTE_MAPPING_KEY;
+	}
+
+	public String label() {
+		return JptUiMappingsMessages.PersistentAttributePage_TransientLabel;
+	}
+
+	public JpaComposite<TransientMapping> buildAttributeMappingComposite(
+			JpaUiFactory factory,
+			PropertyValueModel<TransientMapping> subjectHolder,
+			Composite parent,
+			TabbedPropertySheetWidgetFactory widgetFactory) {
+
+		return factory.createTransientMappingComposite(subjectHolder, parent, widgetFactory);
+	}
+}
\ No newline at end of file
diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/java/details/VersionMappingUiProvider.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/java/details/VersionMappingUiProvider.java
new file mode 100644
index 0000000000..6fdcb598fd
--- /dev/null
+++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/java/details/VersionMappingUiProvider.java
@@ -0,0 +1,59 @@
+/*******************************************************************************
+ * Copyright (c) 2007 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.ui.internal.java.details;
+
+import org.eclipse.jpt.core.MappingKeys;
+import org.eclipse.jpt.core.context.VersionMapping;
+import org.eclipse.jpt.ui.JpaUiFactory;
+import org.eclipse.jpt.ui.details.JpaComposite;
+import org.eclipse.jpt.ui.internal.mappings.JptUiMappingsMessages;
+import org.eclipse.jpt.ui.java.details.AttributeMappingUiProvider;
+import org.eclipse.jpt.utility.internal.model.value.PropertyValueModel;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetWidgetFactory;
+
+public class VersionMappingUiProvider
+	implements AttributeMappingUiProvider<VersionMapping>
+{
+
+	// singleton
+	private static final VersionMappingUiProvider INSTANCE = new VersionMappingUiProvider();
+
+	/**
+	 * Return the singleton.
+	 */
+	public static AttributeMappingUiProvider<VersionMapping> instance() {
+		return INSTANCE;
+	}
+
+	/**
+	 * Ensure non-instantiability.
+	 */
+	private VersionMappingUiProvider() {
+		super();
+	}
+
+	public String attributeMappingKey() {
+		return MappingKeys.VERSION_ATTRIBUTE_MAPPING_KEY;
+	}
+
+	public String label() {
+		return JptUiMappingsMessages.PersistentAttributePage_VersionLabel;
+	}
+
+	public JpaComposite<VersionMapping> buildAttributeMappingComposite(
+			JpaUiFactory factory,
+			PropertyValueModel<VersionMapping> subjectHolder,
+			Composite parent,
+			TabbedPropertySheetWidgetFactory widgetFactory) {
+
+		return factory.createVersionMappingComposite(subjectHolder, parent, widgetFactory);
+	}
+}
\ No newline at end of file