Bug 526158 - [ElementTypes] Element types editor freezes

- Disable translation option in provider, in addition to first patch now for stereotype-application related
  functions. While this solves the problem, it's not clear if this is a good solution, as it modifies
  generated files (at least, a re-generation from the genmodel does not remove the added code)
  I propose the patch as workaround, until a better solution is found

Signed-off-by: Ansgar Radermacher <ansgar.radermacher@cea.fr>

4 files changed, 41 insertions, 15 deletions

diff --git a/plugins/uml/org.eclipse.papyrus.uml.types.core/src-gen/org/eclipse/papyrus/uml/types/core/advices/applystereotype/provider/ApplyStereotypeAdviceEditPlugin.java b/plugins/uml/org.eclipse.papyrus.uml.types.core/src-gen/org/eclipse/papyrus/uml/types/core/advices/applystereotype/provider/ApplyStereotypeAdviceEditPlugin.java
index c3ee598d69d..1030b8ae147 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.types.core/src-gen/org/eclipse/papyrus/uml/types/core/advices/applystereotype/provider/ApplyStereotypeAdviceEditPlugin.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.types.core/src-gen/org/eclipse/papyrus/uml/types/core/advices/applystereotype/provider/ApplyStereotypeAdviceEditPlugin.java
@@ -13,13 +13,9 @@
 package org.eclipse.papyrus.uml.types.core.advices.applystereotype.provider;
 
 import org.eclipse.emf.common.EMFPlugin;
-
 import org.eclipse.emf.common.util.ResourceLocator;
-
 import org.eclipse.emf.ecore.provider.EcoreEditPlugin;
-
 import org.eclipse.papyrus.infra.types.provider.TypesConfigurationsEditPlugin;
-
 import org.eclipse.uml2.uml.edit.UMLEditPlugin;
 
 /**
@@ -37,6 +33,7 @@ public final class ApplyStereotypeAdviceEditPlugin extends EMFPlugin {
 	 */
 	public static final ApplyStereotypeAdviceEditPlugin INSTANCE = new ApplyStereotypeAdviceEditPlugin();
 
+	
 	/**
 	 * Keep track of the singleton.
 	 * <!-- begin-user-doc -->
@@ -49,7 +46,7 @@ public final class ApplyStereotypeAdviceEditPlugin extends EMFPlugin {
 	 * Create the instance.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
+	 * @generated NOT
 	 */
 	public ApplyStereotypeAdviceEditPlugin() {
 		super
@@ -58,6 +55,8 @@ public final class ApplyStereotypeAdviceEditPlugin extends EMFPlugin {
 		     TypesConfigurationsEditPlugin.INSTANCE,
 		     UMLEditPlugin.INSTANCE,
 		   });
+		// Disable translation, see bug 526158 [ElementTypes] Element types editor freezes 
+		setShouldTranslate(false);
 	}
 
 	/**
diff --git a/plugins/uml/org.eclipse.papyrus.uml.types.core/src-gen/org/eclipse/papyrus/uml/types/core/advices/applystereotype/provider/FeatureToSetItemProvider.java b/plugins/uml/org.eclipse.papyrus.uml.types.core/src-gen/org/eclipse/papyrus/uml/types/core/advices/applystereotype/provider/FeatureToSetItemProvider.java
index 77da132b54f..f8780910ce6 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.types.core/src-gen/org/eclipse/papyrus/uml/types/core/advices/applystereotype/provider/FeatureToSetItemProvider.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.types.core/src-gen/org/eclipse/papyrus/uml/types/core/advices/applystereotype/provider/FeatureToSetItemProvider.java
@@ -18,11 +18,8 @@ import java.util.List;
 
 import org.eclipse.emf.common.notify.AdapterFactory;
 import org.eclipse.emf.common.notify.Notification;
-
 import org.eclipse.emf.common.util.ResourceLocator;
-
 import org.eclipse.emf.ecore.EStructuralFeature;
-
 import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
 import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
 import org.eclipse.emf.edit.provider.IItemLabelProvider;
@@ -33,7 +30,6 @@ import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
 import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
 import org.eclipse.emf.edit.provider.ItemProviderAdapter;
 import org.eclipse.emf.edit.provider.ViewerNotification;
-
 import org.eclipse.papyrus.uml.types.core.advices.applystereotype.ApplyStereotypeAdviceFactory;
 import org.eclipse.papyrus.uml.types.core.advices.applystereotype.ApplyStereotypeAdvicePackage;
 import org.eclipse.papyrus.uml.types.core.advices.applystereotype.FeatureToSet;
@@ -62,6 +58,19 @@ public class FeatureToSetItemProvider
 		super(adapterFactory);
 	}
 
+
+	/**
+	 * Disable translation, see bug 526158 [ElementTypes] Element types editor freezes 
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated NOT
+	 */
+	@Override
+	protected boolean shouldTranslate()
+	{
+		return false;
+	}
+
 	/**
 	 * This returns the property descriptors for the adapted class.
 	 * <!-- begin-user-doc -->
diff --git a/plugins/uml/org.eclipse.papyrus.uml.types.core/src-gen/org/eclipse/papyrus/uml/types/core/advices/applystereotype/provider/FeatureValueItemProvider.java b/plugins/uml/org.eclipse.papyrus.uml.types.core/src-gen/org/eclipse/papyrus/uml/types/core/advices/applystereotype/provider/FeatureValueItemProvider.java
index 6a1de060156..0d782b3e0e5 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.types.core/src-gen/org/eclipse/papyrus/uml/types/core/advices/applystereotype/provider/FeatureValueItemProvider.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.types.core/src-gen/org/eclipse/papyrus/uml/types/core/advices/applystereotype/provider/FeatureValueItemProvider.java
@@ -18,9 +18,7 @@ import java.util.List;
 
 import org.eclipse.emf.common.notify.AdapterFactory;
 import org.eclipse.emf.common.notify.Notification;
-
 import org.eclipse.emf.common.util.ResourceLocator;
-
 import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
 import org.eclipse.emf.edit.provider.IItemLabelProvider;
 import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
@@ -54,6 +52,18 @@ public class FeatureValueItemProvider
 	}
 
 	/**
+	 * Disable translation, see bug 526158 [ElementTypes] Element types editor freezes 
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated NOT
+	 */
+	@Override
+	protected boolean shouldTranslate()
+	{
+		return false;
+	}
+
+	/**
 	 * This returns the property descriptors for the adapted class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
diff --git a/plugins/uml/org.eclipse.papyrus.uml.types.core/src-gen/org/eclipse/papyrus/uml/types/core/advices/applystereotype/provider/StereotypeToApplyItemProvider.java b/plugins/uml/org.eclipse.papyrus.uml.types.core/src-gen/org/eclipse/papyrus/uml/types/core/advices/applystereotype/provider/StereotypeToApplyItemProvider.java
index f95a94df4f7..adfb9d1efaa 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.types.core/src-gen/org/eclipse/papyrus/uml/types/core/advices/applystereotype/provider/StereotypeToApplyItemProvider.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.types.core/src-gen/org/eclipse/papyrus/uml/types/core/advices/applystereotype/provider/StereotypeToApplyItemProvider.java
@@ -18,11 +18,8 @@ import java.util.List;
 
 import org.eclipse.emf.common.notify.AdapterFactory;
 import org.eclipse.emf.common.notify.Notification;
-
 import org.eclipse.emf.common.util.ResourceLocator;
-
 import org.eclipse.emf.ecore.EStructuralFeature;
-
 import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
 import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
 import org.eclipse.emf.edit.provider.IItemLabelProvider;
@@ -33,7 +30,6 @@ import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
 import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
 import org.eclipse.emf.edit.provider.ItemProviderAdapter;
 import org.eclipse.emf.edit.provider.ViewerNotification;
-
 import org.eclipse.papyrus.uml.types.core.advices.applystereotype.ApplyStereotypeAdviceFactory;
 import org.eclipse.papyrus.uml.types.core.advices.applystereotype.ApplyStereotypeAdvicePackage;
 import org.eclipse.papyrus.uml.types.core.advices.applystereotype.StereotypeToApply;
@@ -63,6 +59,18 @@ public class StereotypeToApplyItemProvider
 	}
 
 	/**
+	 * Disable translation, see bug 526158 [ElementTypes] Element types editor freezes 
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated NOT
+	 */
+	@Override
+	protected boolean shouldTranslate()
+	{
+		return false;
+	}
+
+	/**
 	 * This returns the property descriptors for the adapted class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->