417409: [Performances - Properties view] Delay in UI when reorganizing diagram layout.

https://bugs.eclipse.org/bugs/show_bug.cgi?id=417409

Make property sheet views reusable, with updating of the bound selection when the selection changes to another element that shows the same views.  This employs new capability of the DataSource to update the selection that it encapsulates, pushing the new selection into the ModelElements that it creates, using a new delegating observable framework.

Property sheet controls are re-used on a per-tab basis.

Because of the new delegation pattern introduced here, we need to be able to ensure that delegate observables are disposed of when they are no longer needed.  This includes not only the delegates of the new DelegatingObservables, but also the delegates of MultipleObservableValue and similar aggregates.  As these delegates can be shared amongst multiple wrappers of different kinds, we use a simple reference counting scheme to ensure that observables are not disposed while they are still in use.  This averts the exceptions discovered in multi-observable (multiple selection) scenarios on a previous iteration of this patch set.

Change-Id: Ide8f3fcea4228083a68bc9d5d39dc5a50217af62

14 files changed, 154 insertions, 64 deletions

diff --git a/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/modelelement/CommentModelElementFactory.java b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/modelelement/CommentModelElementFactory.java
index 5c0d6c429b2..a8de726dc5a 100644
--- a/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/modelelement/CommentModelElementFactory.java
+++ b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/modelelement/CommentModelElementFactory.java
@@ -1,5 +1,5 @@
 /*****************************************************************************

- * Copyright (c) 2012 CEA LIST.

+ * Copyright (c) 2012, 2014 CEA LIST and others.

  *    

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

@@ -8,6 +8,8 @@
  *

  * Contributors:

  *  Sebastien Poissonnet (CEA LIST) sebastien.poissonnet@cea.fr

+ *  Christian W. Damus (CEA) - bug 417409

+ *  

  *****************************************************************************/

 package org.eclipse.papyrus.uml.properties.modelelement;

 

@@ -16,13 +18,13 @@ import org.eclipse.papyrus.infra.emf.utils.EMFHelper;
 import org.eclipse.papyrus.uml.tools.utils.UMLUtil;

 import org.eclipse.papyrus.views.properties.Activator;

 import org.eclipse.papyrus.views.properties.contexts.DataContextElement;

-import org.eclipse.papyrus.views.properties.modelelement.ModelElement;

-import org.eclipse.papyrus.views.properties.modelelement.ModelElementFactory;

+import org.eclipse.papyrus.views.properties.modelelement.AbstractEMFModelElementFactory;

 import org.eclipse.uml2.uml.Element;

 

-public class CommentModelElementFactory implements ModelElementFactory {

+public class CommentModelElementFactory extends AbstractEMFModelElementFactory<CommentModelElement> {

 

-	public ModelElement createFromSource(Object source, DataContextElement context) {

+	@Override

+	protected CommentModelElement doCreateFromSource(Object source, DataContextElement context) {

 		Element umlSource = UMLUtil.resolveUMLElement(source);

 		if(umlSource == null) {

 			Activator.log.warn("Unable to resolve the selected element to a UML Element"); //$NON-NLS-1$

diff --git a/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/modelelement/CustomImageModelElementFactory.java b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/modelelement/CustomImageModelElementFactory.java
index 11f4eb409de..eb8c6cf40bd 100644
--- a/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/modelelement/CustomImageModelElementFactory.java
+++ b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/modelelement/CustomImageModelElementFactory.java
@@ -1,5 +1,5 @@
 /*****************************************************************************

- * Copyright (c) 2011 CEA LIST.

+ * Copyright (c) 2011, 2014 CEA LIST and others.

  * 

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

@@ -8,6 +8,8 @@
  *

  * Contributors:

  *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

+ *  Christian W. Damus (CEA) - bug 417409

+ *  

  *****************************************************************************/

 package org.eclipse.papyrus.uml.properties.modelelement;

 

@@ -16,8 +18,7 @@ import org.eclipse.papyrus.infra.emf.utils.EMFHelper;
 import org.eclipse.papyrus.uml.properties.Activator;

 import org.eclipse.papyrus.uml.tools.utils.UMLUtil;

 import org.eclipse.papyrus.views.properties.contexts.DataContextElement;

-import org.eclipse.papyrus.views.properties.modelelement.ModelElement;

-import org.eclipse.papyrus.views.properties.modelelement.ModelElementFactory;

+import org.eclipse.papyrus.views.properties.modelelement.AbstractModelElementFactory;

 import org.eclipse.uml2.uml.Element;

 import org.eclipse.uml2.uml.Image;

 

@@ -27,9 +28,10 @@ import org.eclipse.uml2.uml.Image;
  * @author Camille Letavernier

  * 

  */

-public class CustomImageModelElementFactory implements ModelElementFactory {

+public class CustomImageModelElementFactory extends AbstractModelElementFactory<CustomImageModelElement> {

 

-	public ModelElement createFromSource(Object sourceElement, DataContextElement context) {

+	@Override

+	protected CustomImageModelElement doCreateFromSource(Object sourceElement, DataContextElement context) {

 		Element umlSource = UMLUtil.resolveUMLElement(sourceElement);

 		if(umlSource == null) {

 			Activator.log.warn("Unable to resolve the selected element to a UML Element"); //$NON-NLS-1$

@@ -45,4 +47,13 @@ public class CustomImageModelElementFactory implements ModelElementFactory {
 		return null;

 	}

 

+	@Override

+	protected void updateModelElement(CustomImageModelElement modelElement, Object newSourceElement) {

+		Element element = UMLUtil.resolveUMLElement(newSourceElement);

+		if(!(element instanceof Image)) {

+			throw new IllegalArgumentException("Cannot resolve UML Image selection: " + newSourceElement);

+		}

+		modelElement.image = (Image)element;

+		modelElement.editingDomain = EMFHelper.resolveEditingDomain(element);

+	}

 }

diff --git a/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/modelelement/MemberEndModelElement.java b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/modelelement/MemberEndModelElement.java
index 326e894de72..d10b6c090f2 100644
--- a/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/modelelement/MemberEndModelElement.java
+++ b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/modelelement/MemberEndModelElement.java
@@ -9,6 +9,7 @@
  * Contributors:

  *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

  *  Christian W. Damus (CEA) - bug 323802

+ *  Christian W. Damus (CEA) - bug 417409

  *  

  *****************************************************************************/

 package org.eclipse.papyrus.uml.properties.modelelement;

@@ -45,9 +46,9 @@ import org.eclipse.uml2.uml.UMLPackage;
  */

 public class MemberEndModelElement extends AbstractModelElement {

 

-	private EObject source;

+	protected EObject source;

 

-	private EditingDomain domain;

+	protected EditingDomain domain;

 

 	/**

 	 * The "multiplicity" virtual property

diff --git a/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/modelelement/ProfileDefinitionModelElementFactory.java b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/modelelement/ProfileDefinitionModelElementFactory.java
index ed2226ab56e..5e0917db1f0 100644
--- a/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/modelelement/ProfileDefinitionModelElementFactory.java
+++ b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/modelelement/ProfileDefinitionModelElementFactory.java
@@ -1,5 +1,5 @@
 /*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

+ * Copyright (c) 2013, 2014 CEA LIST. and others

  * 

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

@@ -8,21 +8,23 @@
  *

  * Contributors:

  *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

+ *  Christian W. Damus (CEA) - bug 417409

+ *  

  *****************************************************************************/

 package org.eclipse.papyrus.uml.properties.modelelement;

 

 import org.eclipse.papyrus.uml.tools.utils.UMLUtil;

 import org.eclipse.papyrus.views.properties.Activator;

 import org.eclipse.papyrus.views.properties.contexts.DataContextElement;

-import org.eclipse.papyrus.views.properties.modelelement.ModelElement;

-import org.eclipse.papyrus.views.properties.modelelement.ModelElementFactory;

+import org.eclipse.papyrus.views.properties.modelelement.AbstractModelElementFactory;

 import org.eclipse.uml2.uml.Element;

 import org.eclipse.uml2.uml.Profile;

 

 

-public class ProfileDefinitionModelElementFactory implements ModelElementFactory {

+public class ProfileDefinitionModelElementFactory extends AbstractModelElementFactory<ProfileDefinitionModelElement> {

 

-	public ModelElement createFromSource(Object sourceElement, DataContextElement context) {

+	@Override

+	protected ProfileDefinitionModelElement doCreateFromSource(Object sourceElement, DataContextElement context) {

 		Element umlSource = UMLUtil.resolveUMLElement(sourceElement);

 		if(umlSource instanceof Profile) {

 			//EditingDomain domain = EMFHelper.resolveEditingDomain(umlSource);

@@ -33,4 +35,12 @@ public class ProfileDefinitionModelElementFactory implements ModelElementFactory
 		return null;

 	}

 

+	@Override

+	protected void updateModelElement(ProfileDefinitionModelElement modelElement, Object newSourceElement) {

+		Element element = org.eclipse.papyrus.uml.tools.utils.UMLUtil.resolveUMLElement(newSourceElement);

+		if(!(element instanceof Profile)) {

+			throw new IllegalArgumentException("Cannot resolve UML Profile selection: " + newSourceElement);

+		}

+		modelElement.profile = (Profile)element;

+	}

 }

diff --git a/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/modelelement/StereotypeAppearanceFactory.java b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/modelelement/StereotypeAppearanceFactory.java
index 815c2f19be6..588a3d899e0 100644
--- a/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/modelelement/StereotypeAppearanceFactory.java
+++ b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/modelelement/StereotypeAppearanceFactory.java
@@ -1,5 +1,5 @@
 /*****************************************************************************

- * Copyright (c) 2011 CEA LIST.

+ * Copyright (c) 2011, 2014 CEA LIST and others.

  * 

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

@@ -8,6 +8,8 @@
  *

  * Contributors:

  *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

+ *  Christian W. Damus (CEA) - bug 417409

+ *  

  *****************************************************************************/

 package org.eclipse.papyrus.uml.properties.modelelement;

 

@@ -18,8 +20,7 @@ import org.eclipse.papyrus.infra.emf.utils.EMFHelper;
 import org.eclipse.papyrus.uml.tools.utils.UMLUtil;

 import org.eclipse.papyrus.views.properties.Activator;

 import org.eclipse.papyrus.views.properties.contexts.DataContextElement;

-import org.eclipse.papyrus.views.properties.modelelement.ModelElement;

-import org.eclipse.papyrus.views.properties.modelelement.ModelElementFactory;

+import org.eclipse.papyrus.views.properties.modelelement.AbstractModelElementFactory;

 import org.eclipse.uml2.uml.Element;

 

 /**

@@ -28,9 +29,10 @@ import org.eclipse.uml2.uml.Element;
  * @author Camille Letavernier

  * 

  */

-public class StereotypeAppearanceFactory implements ModelElementFactory {

+public class StereotypeAppearanceFactory extends AbstractModelElementFactory<StereotypeAppearanceModelElement> {

 

-	public ModelElement createFromSource(Object sourceElement, DataContextElement context) {

+	@Override

+	protected StereotypeAppearanceModelElement doCreateFromSource(Object sourceElement, DataContextElement context) {

 		Element umlSource = UMLUtil.resolveUMLElement(sourceElement);

 

 		if(umlSource == null) {

@@ -48,4 +50,15 @@ public class StereotypeAppearanceFactory implements ModelElementFactory {
 		return null;

 	}

 

+	@Override

+	protected void updateModelElement(StereotypeAppearanceModelElement modelElement, Object newSourceElement) {

+		if(!(newSourceElement instanceof EditPart)) {

+			throw new IllegalArgumentException("Cannot resolve EditPart selection: " + newSourceElement);

+		}

+		

+		Element umlSource = UMLUtil.resolveUMLElement(newSourceElement);

+		modelElement.umlSource = umlSource;

+		modelElement.diagramElement = (EModelElement)((EditPart)newSourceElement).getModel();

+		modelElement.domain = EMFHelper.resolveEditingDomain(umlSource);

+	}

 }

diff --git a/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/modelelement/StereotypeAppearanceModelElement.java b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/modelelement/StereotypeAppearanceModelElement.java
index 033b0071f2b..53612a08ae8 100644
--- a/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/modelelement/StereotypeAppearanceModelElement.java
+++ b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/modelelement/StereotypeAppearanceModelElement.java
@@ -9,6 +9,7 @@
  * Contributors:

  *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

  *  Christian W. Damus (CEA) - bug 323802

+ *  Christian W. Damus (CEA) - bug 417409

  *  

  *****************************************************************************/

 package org.eclipse.papyrus.uml.properties.modelelement;

@@ -36,7 +37,6 @@ import org.eclipse.papyrus.infra.widgets.providers.StaticContentProvider;
 import org.eclipse.papyrus.uml.properties.Activator;

 import org.eclipse.papyrus.uml.properties.databinding.StereotypeAppearanceObservableValue;

 import org.eclipse.papyrus.views.properties.modelelement.AbstractModelElement;

-import org.eclipse.papyrus.views.properties.modelelement.ModelElement;

 import org.eclipse.uml2.uml.Element;

 

 /**

@@ -48,7 +48,7 @@ import org.eclipse.uml2.uml.Element;
  * @author Camille Letavernier

  * 

  */

-public class StereotypeAppearanceModelElement extends AbstractModelElement implements ModelElement {

+public class StereotypeAppearanceModelElement extends AbstractModelElement {

 

 	/**

 	 * The current UML Element

diff --git a/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/modelelement/StereotypeApplicationFactory.java b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/modelelement/StereotypeApplicationFactory.java
index b9720d0b759..c1d89b32dd7 100644
--- a/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/modelelement/StereotypeApplicationFactory.java
+++ b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/modelelement/StereotypeApplicationFactory.java
@@ -1,5 +1,5 @@
 /*****************************************************************************

- * Copyright (c) 2011 CEA LIST.

+ * Copyright (c) 2011, 2014 CEA LIST and others.

  * 

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

@@ -8,6 +8,8 @@
  *

  * Contributors:

  *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

+ *  Christian W. Damus (CEA) - bug 417409

+ *  

  *****************************************************************************/

 package org.eclipse.papyrus.uml.properties.modelelement;

 

@@ -17,8 +19,7 @@ import org.eclipse.papyrus.infra.emf.utils.EMFHelper;
 import org.eclipse.papyrus.uml.tools.utils.UMLUtil;

 import org.eclipse.papyrus.views.properties.Activator;

 import org.eclipse.papyrus.views.properties.contexts.DataContextElement;

-import org.eclipse.papyrus.views.properties.modelelement.ModelElement;

-import org.eclipse.papyrus.views.properties.modelelement.ModelElementFactory;

+import org.eclipse.papyrus.views.properties.modelelement.AbstractEMFModelElementFactory;

 import org.eclipse.uml2.uml.Element;

 

 /**

@@ -28,9 +29,10 @@ import org.eclipse.uml2.uml.Element;
  * @author Camille Letavernier

  * 

  */

-public class StereotypeApplicationFactory implements ModelElementFactory {

+public class StereotypeApplicationFactory extends AbstractEMFModelElementFactory<StereotypeApplicationModelElement> {

 

-	public ModelElement createFromSource(Object sourceElement, DataContextElement context) {

+	@Override

+	protected StereotypeApplicationModelElement doCreateFromSource(Object sourceElement, DataContextElement context) {

 		Element umlSource = UMLUtil.resolveUMLElement(sourceElement);

 		if(umlSource == null) {

 			Activator.log.warn("Unable to resolve the selected element to a UML Element"); //$NON-NLS-1$

@@ -45,4 +47,16 @@ public class StereotypeApplicationFactory implements ModelElementFactory {
 		}

 	}

 

+	@Override

+	protected void updateModelElement(StereotypeApplicationModelElement modelElement, Object newSourceElement) {

+		Element element = UMLUtil.resolveUMLElement(newSourceElement);

+		if(element == null) {

+			throw new IllegalArgumentException("Cannot resolve UML element selection: " + newSourceElement);

+		}

+		modelElement.umlSource = element;

+		modelElement.domain = EMFHelper.resolveEditingDomain(element);

+		modelElement.sourceElement = (newSourceElement instanceof EditPart) ? (EditPart)newSourceElement : null;

+

+		super.updateModelElement(modelElement, newSourceElement);

+	}

 }

diff --git a/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/modelelement/StereotypeApplicationModelElement.java b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/modelelement/StereotypeApplicationModelElement.java
index 814a1519a5a..2ff1bf70958 100644
--- a/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/modelelement/StereotypeApplicationModelElement.java
+++ b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/modelelement/StereotypeApplicationModelElement.java
@@ -1,5 +1,5 @@
 /*****************************************************************************

- * Copyright (c) 2011 CEA LIST.

+ * Copyright (c) 2011, 2014 CEA LIST and others.

  * 

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

@@ -8,6 +8,8 @@
  *

  * Contributors:

  *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

+ *  Christian W. Damus (CEA) - bug 417409

+ *  

  *****************************************************************************/

 package org.eclipse.papyrus.uml.properties.modelelement;

 

@@ -41,11 +43,11 @@ import org.eclipse.uml2.uml.UMLPackage;
  */

 public class StereotypeApplicationModelElement extends EMFModelElement {

 

-	private Element umlSource;

+	protected Element umlSource;

 

-	private EditingDomain domain;

+	protected EditingDomain domain;

 

-	private EditPart sourceElement;

+	protected EditPart sourceElement;

 

 	/**

 	 * The "stereotypeApplication" pseudo-property for a UML Element

diff --git a/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/modelelement/StereotypeModelElementFactory.java b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/modelelement/StereotypeModelElementFactory.java
index 9a53ab7eaf6..fd4cde0488e 100644
--- a/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/modelelement/StereotypeModelElementFactory.java
+++ b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/modelelement/StereotypeModelElementFactory.java
@@ -1,5 +1,5 @@
 /*****************************************************************************

- * Copyright (c) 2010 CEA LIST.

+ * Copyright (c) 2010, 2014 CEA LIST and others.

  * 

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

@@ -8,6 +8,8 @@
  *

  * Contributors:

  *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

+ *  Christian W. Damus (CEA) - bug 417409

+ *  

  *****************************************************************************/

 package org.eclipse.papyrus.uml.properties.modelelement;

 

@@ -17,8 +19,8 @@ import org.eclipse.papyrus.infra.emf.utils.EMFHelper;
 import org.eclipse.papyrus.uml.properties.Activator;

 import org.eclipse.papyrus.uml.tools.utils.UMLUtil;

 import org.eclipse.papyrus.views.properties.contexts.DataContextElement;

-import org.eclipse.papyrus.views.properties.modelelement.ModelElement;

-import org.eclipse.papyrus.views.properties.modelelement.ModelElementFactory;

+import org.eclipse.papyrus.views.properties.modelelement.EMFModelElement;

+import org.eclipse.papyrus.views.properties.modelelement.EMFModelElementFactory;

 import org.eclipse.uml2.uml.Element;

 import org.eclipse.uml2.uml.Stereotype;

 

@@ -41,9 +43,10 @@ import org.eclipse.uml2.uml.Stereotype;
  * 

  * @author Camille Letavernier

  */

-public class StereotypeModelElementFactory implements ModelElementFactory {

+public class StereotypeModelElementFactory extends EMFModelElementFactory {

 

-	public ModelElement createFromSource(Object source, DataContextElement context) {

+	@Override

+	protected EMFModelElement doCreateFromSource(Object source, DataContextElement context) {

 		Element umlElement = UMLUtil.resolveUMLElement(source);

 

 		if(umlElement != null) {

diff --git a/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/modelelement/UMLEditorFactory.java b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/modelelement/UMLEditorFactory.java
index 4416258fe15..ef56f526563 100644
--- a/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/modelelement/UMLEditorFactory.java
+++ b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/modelelement/UMLEditorFactory.java
@@ -1,5 +1,5 @@
 /*****************************************************************************

- * Copyright (c) 2010 CEA LIST.

+ * Copyright (c) 2010, 2014 CEA LIST and others.

  *    

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

@@ -8,6 +8,8 @@
  *

  * Contributors:

  *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

+ *  Christian W. Damus (CEA) - bug 417409

+ *  

  *****************************************************************************/

 package org.eclipse.papyrus.uml.properties.modelelement;

 

@@ -16,8 +18,7 @@ import org.eclipse.emf.edit.domain.EditingDomain;
 import org.eclipse.papyrus.infra.emf.utils.EMFHelper;

 import org.eclipse.papyrus.uml.properties.Activator;

 import org.eclipse.papyrus.views.properties.contexts.DataContextElement;

-import org.eclipse.papyrus.views.properties.modelelement.ModelElement;

-import org.eclipse.papyrus.views.properties.modelelement.ModelElementFactory;

+import org.eclipse.papyrus.views.properties.modelelement.AbstractModelElementFactory;

 

 /**

  * A Factory for building ModelElements for specific UML properties

@@ -25,9 +26,10 @@ import org.eclipse.papyrus.views.properties.modelelement.ModelElementFactory;
  * 

  * @author Camille Letavernier

  */

-public class UMLEditorFactory implements ModelElementFactory {

+public class UMLEditorFactory extends AbstractModelElementFactory<MemberEndModelElement> {

 

-	public ModelElement createFromSource(Object sourceElement, DataContextElement context) {

+	@Override

+	protected MemberEndModelElement doCreateFromSource(Object sourceElement, DataContextElement context) {

 		EObject source = EMFHelper.getEObject(sourceElement);

 		if(source == null) {

 			Activator.log.warn("Unable to resolve the selected element to an EObject"); //$NON-NLS-1$

@@ -39,4 +41,13 @@ public class UMLEditorFactory implements ModelElementFactory {
 		return new MemberEndModelElement(source, domain);

 	}

 

+	@Override

+	protected void updateModelElement(MemberEndModelElement modelElement, Object newSourceElement) {

+		EObject eObject = EMFHelper.getEObject(newSourceElement);

+		if(eObject == null) {

+			throw new IllegalArgumentException("Cannot resolve EObject selection: " + newSourceElement);

+		}

+		modelElement.source = eObject;

+		modelElement.domain = EMFHelper.resolveEditingDomain(eObject);

+	}

 }

diff --git a/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/modelelement/UMLModelElementFactory.java b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/modelelement/UMLModelElementFactory.java
index 38fff4b2838..fb909dd50bf 100644
--- a/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/modelelement/UMLModelElementFactory.java
+++ b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/modelelement/UMLModelElementFactory.java
@@ -1,5 +1,5 @@
 /*****************************************************************************

- * Copyright (c) 2010 CEA LIST.

+ * Copyright (c) 2010, 2014 CEA LIST and others.

  *    

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

@@ -8,6 +8,8 @@
  *

  * Contributors:

  *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

+ *  Christian W. Damus (CEA) - bug 417409

+ *  

  *****************************************************************************/

 package org.eclipse.papyrus.uml.properties.modelelement;

 

@@ -16,8 +18,7 @@ import org.eclipse.papyrus.infra.emf.utils.EMFHelper;
 import org.eclipse.papyrus.uml.tools.utils.UMLUtil;

 import org.eclipse.papyrus.views.properties.Activator;

 import org.eclipse.papyrus.views.properties.contexts.DataContextElement;

-import org.eclipse.papyrus.views.properties.modelelement.EMFModelElementFactory;

-import org.eclipse.papyrus.views.properties.modelelement.ModelElement;

+import org.eclipse.papyrus.views.properties.modelelement.AbstractEMFModelElementFactory;

 import org.eclipse.uml2.uml.Element;

 

 /**

@@ -25,10 +26,10 @@ import org.eclipse.uml2.uml.Element;
  * 

  * @author Camille Letavernier

  */

-public class UMLModelElementFactory extends EMFModelElementFactory {

+public class UMLModelElementFactory extends AbstractEMFModelElementFactory<UMLModelElement> {

 

 	@Override

-	public ModelElement createFromSource(Object source, DataContextElement context) {

+	protected UMLModelElement doCreateFromSource(Object source, DataContextElement context) {

 		Element umlSource = UMLUtil.resolveUMLElement(source);

 		if(umlSource == null) {

 			Activator.log.warn("Unable to resolve the selected element to a UML Element"); //$NON-NLS-1$

diff --git a/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/modelelement/UMLNotationFactory.java b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/modelelement/UMLNotationFactory.java
index 8bc23caf53e..a1ba5c2c92c 100644
--- a/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/modelelement/UMLNotationFactory.java
+++ b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/modelelement/UMLNotationFactory.java
@@ -1,5 +1,5 @@
 /*****************************************************************************

- * Copyright (c) 2011 CEA LIST.

+ * Copyright (c) 2011, 2014 CEA LIST and others.

  * 

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

@@ -8,13 +8,14 @@
  *

  * Contributors:

  *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

+ *  Christian W. Damus (CEA) - bug 417409

+ *  

  *****************************************************************************/

 package org.eclipse.papyrus.uml.properties.modelelement;

 

 import org.eclipse.gef.EditPart;

 import org.eclipse.papyrus.views.properties.contexts.DataContextElement;

-import org.eclipse.papyrus.views.properties.modelelement.ModelElement;

-import org.eclipse.papyrus.views.properties.modelelement.ModelElementFactory;

+import org.eclipse.papyrus.views.properties.modelelement.AbstractModelElementFactory;

 

 /**

  * A ModelElementFactory for handling UML-specific appearance properties

@@ -22,13 +23,21 @@ import org.eclipse.papyrus.views.properties.modelelement.ModelElementFactory;
  * @author Camille Letavernier

  * 

  */

-public class UMLNotationFactory implements ModelElementFactory {

+public class UMLNotationFactory extends AbstractModelElementFactory<UMLNotationModelElement> {

 

-	public ModelElement createFromSource(Object sourceElement, DataContextElement context) {

+	@Override

+	protected UMLNotationModelElement doCreateFromSource(Object sourceElement, DataContextElement context) {

 		if(sourceElement instanceof EditPart) {

 			return new UMLNotationModelElement((EditPart)sourceElement);

 		}

 		return null;

 	}

 

+	@Override

+	protected void updateModelElement(UMLNotationModelElement modelElement, Object newSourceElement) {

+		if(!(newSourceElement instanceof EditPart)) {

+			throw new IllegalArgumentException("Cannot resolve EditPart selection: " + newSourceElement);

+		}

+		modelElement.sourceElement = (EditPart)newSourceElement;

+	}

 }

diff --git a/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/modelelement/UMLNotationModelElement.java b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/modelelement/UMLNotationModelElement.java
index c6c680cd2d8..e72a6ce32d2 100644
--- a/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/modelelement/UMLNotationModelElement.java
+++ b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/modelelement/UMLNotationModelElement.java
@@ -9,6 +9,7 @@
  * Contributors:

  *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

  *  Christian W. Damus (CEA) - bug 323802

+ *  Christian W. Damus (CEA) - bug 417409

  *  

  *****************************************************************************/

 package org.eclipse.papyrus.uml.properties.modelelement;

@@ -68,7 +69,7 @@ public class UMLNotationModelElement extends AbstractModelElement {
 	/**

 	 * The GMF EditPart represented by this ModelElement

 	 */

-	private EditPart sourceElement;

+	protected EditPart sourceElement;

 

 	/**

 	 * 

diff --git a/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/widgets/StereotypeApplication.java b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/widgets/StereotypeApplication.java
index 966bbcd8bdb..a582e5baa79 100644
--- a/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/widgets/StereotypeApplication.java
+++ b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/widgets/StereotypeApplication.java
@@ -1,5 +1,5 @@
 /*****************************************************************************

- * Copyright (c) 2011 CEA LIST.

+ * Copyright (c) 2011, 2014 CEA LIST and others.

  * 

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

@@ -8,6 +8,8 @@
  *

  * Contributors:

  *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

+ *  Christian W. Damus (CEA) - bug 417409

+ *  

  *****************************************************************************/

 package org.eclipse.papyrus.uml.properties.widgets;

 

@@ -59,24 +61,34 @@ public class StereotypeApplication extends AbstractPropertyEditor {
 		// for editing the data

 		ModelElement element = input.getModelElement(propertyPath);

 		if(element instanceof StereotypeApplicationModelElement) {

+			internalDoBinding();

+

+			input.getObservable(propertyPath).addChangeListener(new IChangeListener() {

+				public void handleChange(ChangeEvent event) {

+					// re-do the injection into the stereotype composite because the

+					// underlying model element selection may have been changed

+					internalDoBinding();

+				}

+			});

+		}

+	}

+	

+	protected void internalDoBinding() {

+		ModelElement element = input.getModelElement(propertyPath);

+		if(element instanceof StereotypeApplicationModelElement) {

 			StereotypeApplicationModelElement modelElement = (StereotypeApplicationModelElement)element;

 

 			View diagramElement = (View)modelElement.getGraphicalElement();

 			//EditPart editPart = ((StereotypeApplicationModelElement)element).getEditPart();

 			final Element umlElement = modelElement.getUMLElement();

 

-			//stereotypeComposite.setSelection(new StructuredSelection(Collections.singletonList(editPart)));

-			stereotypeComposite.setElement(umlElement);

-			stereotypeComposite.setInput(new StereotypedElementTreeObject(umlElement));

+			if(stereotypeComposite.getElement() != umlElement) {

+				stereotypeComposite.setElement(umlElement);

+				stereotypeComposite.setInput(new StereotypedElementTreeObject(umlElement));

+			}

 			stereotypeComposite.setDiagramElement(diagramElement);

 

 			stereotypeComposite.refresh();

-

-			input.getObservable(propertyPath).addChangeListener(new IChangeListener() {

-				public void handleChange(ChangeEvent event) {

-					stereotypeComposite.refresh();

-				}

-			});

 		}

 	}

 }