Fix for Bug 353328 - ModelService.cloneElement() should not clone widgetv20110830-1948

and renderer fields (Editor changes)

3 files changed, 28 insertions, 1 deletions

diff --git a/bundles/org.eclipse.e4.ui.model.workbench.edit/plugin.properties b/bundles/org.eclipse.e4.ui.model.workbench.edit/plugin.properties
index 59e62e8ff2f..cc681f2db7d 100644
--- a/bundles/org.eclipse.e4.ui.model.workbench.edit/plugin.properties
+++ b/bundles/org.eclipse.e4.ui.model.workbench.edit/plugin.properties
@@ -276,3 +276,6 @@ _UI_ApplicationElement_clonableSnippets_feature = Clonable Snippets
 _UI_OpaqueToolItem_opaqueItem_feature = Opaque Item
 _UI_Placeholder_closeable_feature = Closeable
 _UI_ApplicationElement_transientData_feature = Transient Data
+_UI_StringToObjectMap_type = String To Object Map
+_UI_StringToObjectMap_key_feature = Key
+_UI_StringToObjectMap_value_feature = Value
diff --git a/bundles/org.eclipse.e4.ui.model.workbench.edit/src/org/eclipse/e4/ui/model/application/provider/ApplicationElementItemProvider.java b/bundles/org.eclipse.e4.ui.model.workbench.edit/src/org/eclipse/e4/ui/model/application/provider/ApplicationElementItemProvider.java
index 2cab413747c..ae672b728aa 100644
--- a/bundles/org.eclipse.e4.ui.model.workbench.edit/src/org/eclipse/e4/ui/model/application/provider/ApplicationElementItemProvider.java
+++ b/bundles/org.eclipse.e4.ui.model.workbench.edit/src/org/eclipse/e4/ui/model/application/provider/ApplicationElementItemProvider.java
@@ -162,7 +162,7 @@ public class ApplicationElementItemProvider
 				 true,
 				 false,
 				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+				 null,
 				 null,
 				 null));
 	}
diff --git a/bundles/org.eclipse.e4.ui.model.workbench.edit/src/org/eclipse/e4/ui/model/application/provider/ApplicationItemProviderAdapterFactory.java b/bundles/org.eclipse.e4.ui.model.workbench.edit/src/org/eclipse/e4/ui/model/application/provider/ApplicationItemProviderAdapterFactory.java
index f9cc41c8f75..fcc5212c3f2 100644
--- a/bundles/org.eclipse.e4.ui.model.workbench.edit/src/org/eclipse/e4/ui/model/application/provider/ApplicationItemProviderAdapterFactory.java
+++ b/bundles/org.eclipse.e4.ui.model.workbench.edit/src/org/eclipse/e4/ui/model/application/provider/ApplicationItemProviderAdapterFactory.java
@@ -146,6 +146,29 @@ public class ApplicationItemProviderAdapterFactory extends ApplicationAdapterFac
 	}
 
 	/**
+	 * This keeps track of the one adapter used for all {@link java.util.Map.Entry} instances.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected StringToObjectMapItemProvider stringToObjectMapItemProvider;
+
+	/**
+	 * This creates an adapter for a {@link java.util.Map.Entry}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Adapter createStringToObjectMapAdapter() {
+		if (stringToObjectMapItemProvider == null) {
+			stringToObjectMapItemProvider = new StringToObjectMapItemProvider(this);
+		}
+
+		return stringToObjectMapItemProvider;
+	}
+
+	/**
 	 * This returns the root adapter factory that contains this factory.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -247,6 +270,7 @@ public class ApplicationItemProviderAdapterFactory extends ApplicationAdapterFac
 		if (stringToStringMapItemProvider != null) stringToStringMapItemProvider.dispose();
 		if (applicationItemProvider != null) applicationItemProvider.dispose();
 		if (addonItemProvider != null) addonItemProvider.dispose();
+		if (stringToObjectMapItemProvider != null) stringToObjectMapItemProvider.dispose();
 	}
 
 }