254818 - basic UI for basic-collection, basic-map, and transformation mapping for eclipselink

3 files changed, 9 insertions, 25 deletions

diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/JpaMappingImageHelper.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/JpaMappingImageHelper.java
index 4ad40adb32..5a2e9caaaf 100644
--- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/JpaMappingImageHelper.java
+++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/JpaMappingImageHelper.java
@@ -66,6 +66,7 @@ public class JpaMappingImageHelper
 		else if (MappingKeys.TRANSIENT_ATTRIBUTE_MAPPING_KEY.equals(mappingKey)) {
 			return JptUiPlugin.getImage(JptUiIcons.TRANSIENT);
 		}
-		return null;
+		//return the JPA_CONTENT icon instead of null, might as well have an icon if one is not defined
+		return JptUiPlugin.getImage(JptUiIcons.JPA_CONTENT);
 	}
 }
diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/dialogs/AddPersistentAttributeToXmlAndMapDialog.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/dialogs/AddPersistentAttributeToXmlAndMapDialog.java
index b639d38531..74d189088f 100644
--- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/dialogs/AddPersistentAttributeToXmlAndMapDialog.java
+++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/dialogs/AddPersistentAttributeToXmlAndMapDialog.java
@@ -20,19 +20,11 @@ import org.eclipse.jface.viewers.SelectionChangedEvent;
 import org.eclipse.jface.viewers.StructuredSelection;
 import org.eclipse.jface.viewers.Viewer;
 import org.eclipse.jpt.core.context.orm.OrmPersistentAttribute;
+import org.eclipse.jpt.ui.JpaPlatformUi;
 import org.eclipse.jpt.ui.JptUiPlugin;
 import org.eclipse.jpt.ui.details.AttributeMappingUiProvider;
 import org.eclipse.jpt.ui.internal.JptUiMessages;
-import org.eclipse.jpt.ui.internal.details.BasicMappingUiProvider;
-import org.eclipse.jpt.ui.internal.details.EmbeddedIdMappingUiProvider;
-import org.eclipse.jpt.ui.internal.details.EmbeddedMappingUiProvider;
-import org.eclipse.jpt.ui.internal.details.IdMappingUiProvider;
-import org.eclipse.jpt.ui.internal.details.ManyToManyMappingUiProvider;
-import org.eclipse.jpt.ui.internal.details.ManyToOneMappingUiProvider;
-import org.eclipse.jpt.ui.internal.details.OneToManyMappingUiProvider;
-import org.eclipse.jpt.ui.internal.details.OneToOneMappingUiProvider;
-import org.eclipse.jpt.ui.internal.details.TransientMappingUiProvider;
-import org.eclipse.jpt.ui.internal.details.VersionMappingUiProvider;
+import org.eclipse.jpt.utility.internal.CollectionTools;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.layout.GridLayout;
@@ -85,18 +77,7 @@ public class AddPersistentAttributeToXmlAndMapDialog extends StatusDialog
 				public void dispose() {}
 
 				public Object[] getElements(Object inputElement) {
-					return new Object[] {
-						BasicMappingUiProvider.instance(),
-						EmbeddedMappingUiProvider.instance(),
-						EmbeddedIdMappingUiProvider.instance(),
-						IdMappingUiProvider.instance(),
-						ManyToManyMappingUiProvider.instance(),
-						ManyToOneMappingUiProvider.instance(),
-						OneToManyMappingUiProvider.instance(),
-						OneToOneMappingUiProvider.instance(),
-						TransientMappingUiProvider.instance(),
-						VersionMappingUiProvider.instance()
-					};
+					return CollectionTools.array(((JpaPlatformUi) inputElement).ormAttributeMappingUiProviders());
 				}
 
 				public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {}
@@ -113,7 +94,8 @@ public class AddPersistentAttributeToXmlAndMapDialog extends StatusDialog
 				validate();
 			}
 		});
-		mappingCombo.setInput("FOO");
+		JpaPlatformUi jpaPlatformUi = JptUiPlugin.getPlugin().jpaPlatformUi(this.unmappedPersistentAttribute.getJpaProject().getJpaPlatform());
+		mappingCombo.setInput(jpaPlatformUi);
 		mappingCombo.getCombo().select(0);  // select Basic to begin
 
 		// TODO - F1 Help
diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/structure/OrmItemLabelProviderFactory.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/structure/OrmItemLabelProviderFactory.java
index 531f515718..842728ddc9 100644
--- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/structure/OrmItemLabelProviderFactory.java
+++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/structure/OrmItemLabelProviderFactory.java
@@ -16,11 +16,12 @@ import org.eclipse.jpt.ui.jface.ItemLabelProvider;
 
 public class OrmItemLabelProviderFactory extends GeneralJpaMappingItemLabelProviderFactory
 {
+	@Override
 	public ItemLabelProvider buildItemLabelProvider(
 			Object item, DelegatingContentAndLabelProvider labelProvider) {
 		if (item instanceof EntityMappings) {
 			return new EntityMappingsItemLabelProvider((EntityMappings) item, labelProvider);
 		}
-		else return super.buildItemLabelProvider(item, labelProvider);
+		return super.buildItemLabelProvider(item, labelProvider);
 	}
 }