351146: [Property View] Customization : an error occurs when saving a context depending on another context

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

+ small changes and fixes

6 files changed, 13 insertions, 20 deletions

diff --git a/plugins/configurationTK/org.eclipse.papyrus.properties.customization/plugin.xml b/plugins/configurationTK/org.eclipse.papyrus.properties.customization/plugin.xml
index 869859f096f..bc8c86ffee3 100644
--- a/plugins/configurationTK/org.eclipse.papyrus.properties.customization/plugin.xml
+++ b/plugins/configurationTK/org.eclipse.papyrus.properties.customization/plugin.xml
@@ -112,6 +112,10 @@
             description="%command.description.1"

             id="org.eclipse.papyrus.properties.customization.ToggleDataContext"

             name="%command.name.1">

+            <state

+               class="org.eclipse.papyrus.properties.customization.editor.actions.ToggleDataContextState"

+               id="org.eclipse.papyrus.properties.customization.displayContextState">

+         </state>

       </command>

    </extension>

    <extension

diff --git a/plugins/configurationTK/org.eclipse.papyrus.properties.customization/src/org/eclipse/papyrus/properties/customization/editor/UIEditor.java b/plugins/configurationTK/org.eclipse.papyrus.properties.customization/src/org/eclipse/papyrus/properties/customization/editor/UIEditor.java
index 2dca619aac6..cabf65da377 100644
--- a/plugins/configurationTK/org.eclipse.papyrus.properties.customization/src/org/eclipse/papyrus/properties/customization/editor/UIEditor.java
+++ b/plugins/configurationTK/org.eclipse.papyrus.properties.customization/src/org/eclipse/papyrus/properties/customization/editor/UIEditor.java
@@ -1,6 +1,6 @@
 /*****************************************************************************

  * Copyright (c) 2010 CEA LIST.

- *    

+ * 

  * 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

@@ -41,6 +41,7 @@ import org.eclipse.jface.viewers.StructuredSelection;
 import org.eclipse.jface.viewers.StructuredViewer;

 import org.eclipse.jface.viewers.TreeViewer;

 import org.eclipse.jface.viewers.ViewerFilter;

+import org.eclipse.papyrus.properties.catalog.PropertiesURIHandler;

 import org.eclipse.papyrus.properties.contexts.Context;

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

 import org.eclipse.papyrus.properties.customization.editor.preview.Preview;

@@ -179,6 +180,10 @@ public class UIEditor extends EcoreEditor implements ITabbedPropertySheetPageCon
 		updateProblemIndication();

 

 		changePerspective();

+

+		//FIXME ppe:/ conversion

+		//This is a hack. The ppe:/ URIs are not correctly converted when the model is saved.

+		getEditingDomain().getResourceSet().getURIConverter().getURIHandlers().add(0, new PropertiesURIHandler());

 	}

 

 	protected void changePerspective() {

diff --git a/plugins/core/org.eclipse.papyrus.modelexplorer.widgets/src/org/eclipse/papyrus/modelexplorer/widgets/GraphicalModelExplorerBasedContentProvider.java b/plugins/core/org.eclipse.papyrus.modelexplorer.widgets/src/org/eclipse/papyrus/modelexplorer/widgets/GraphicalModelExplorerBasedContentProvider.java
index 3f52cad26f0..6cd09e14ae5 100644
--- a/plugins/core/org.eclipse.papyrus.modelexplorer.widgets/src/org/eclipse/papyrus/modelexplorer/widgets/GraphicalModelExplorerBasedContentProvider.java
+++ b/plugins/core/org.eclipse.papyrus.modelexplorer.widgets/src/org/eclipse/papyrus/modelexplorer/widgets/GraphicalModelExplorerBasedContentProvider.java
@@ -218,7 +218,7 @@ public class GraphicalModelExplorerBasedContentProvider extends ModelContentProv
 	 */

 	public void createAfter(Composite parent) {

 		parent.setLayout(new GridLayout(1, false));

-		createMetaclassFilter(parent);

+		//		createMetaclassFilter(parent); //Disabled

 		createHistory(parent);

 		createDetailArea(parent);

 	}

diff --git a/plugins/core/org.eclipse.papyrus.properties/src/org/eclipse/papyrus/properties/modelelement/AbstractModelElement.java b/plugins/core/org.eclipse.papyrus.properties/src/org/eclipse/papyrus/properties/modelelement/AbstractModelElement.java
index 5c5cebab16d..0aea92d384f 100644
--- a/plugins/core/org.eclipse.papyrus.properties/src/org/eclipse/papyrus/properties/modelelement/AbstractModelElement.java
+++ b/plugins/core/org.eclipse.papyrus.properties/src/org/eclipse/papyrus/properties/modelelement/AbstractModelElement.java
@@ -128,6 +128,7 @@ public abstract class AbstractModelElement implements ModelElement {
 		for(IObservable observable : observables) {

 			observable.dispose();

 		}

+		observables.clear();

 	}

 

 }

diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/META-INF/MANIFEST.MF b/plugins/uml/org.eclipse.papyrus.properties.uml/META-INF/MANIFEST.MF
index f53bfce4eb0..9524e9a235e 100644
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/META-INF/MANIFEST.MF
+++ b/plugins/uml/org.eclipse.papyrus.properties.uml/META-INF/MANIFEST.MF
@@ -24,6 +24,7 @@ Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Bundle-Vendor: %Bundle-Vendor
 Export-Package: org.eclipse.papyrus.properties.uml.constraints,
  org.eclipse.papyrus.properties.uml.databinding,
+ org.eclipse.papyrus.properties.uml.databinding.command,
  org.eclipse.papyrus.properties.uml.modelelement,
  org.eclipse.papyrus.properties.uml.util
 Bundle-ActivationPolicy: lazy
diff --git a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/Environment.xmi b/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/Environment.xmi
deleted file mode 100644
index bfc5acb314e..00000000000
--- a/plugins/uml/org.eclipse.papyrus.properties.uml/Model/UML/Environment.xmi
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="ASCII"?>

-<environment:Environment xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:environment="http://www.eclipse.org/papyrus/properties/environment">

-  <modelElementFactories name="UML Specific Factory" factoryClass="org.eclipse.papyrus.properties.uml.modelelement.UMLEditorFactory"/>

-  <modelElementFactories name="UML Factory" factoryClass="org.eclipse.papyrus.properties.uml.modelelement.UMLModelElementFactory"/>

-  <modelElementFactories name="Stereotype Factory" factoryClass="org.eclipse.papyrus.properties.uml.modelelement.StereotypeModelElementFactory"/>

-  <modelElementFactories name="Stereotype Application Factory" factoryClass="org.eclipse.papyrus.properties.uml.modelelement.StereotypeApplicationFactory"/>

-  <modelElementFactories name="UML Notation Factory" factoryClass="org.eclipse.papyrus.properties.uml.modelelement.UMLNotationFactory"/>

-  <modelElementFactories name="Custom Image Factory" factoryClass="org.eclipse.papyrus.properties.uml.modelelement.CustomImageModelElementFactory"/>

-  <modelElementFactories name="Stereotype Appearance Factory" factoryClass="org.eclipse.papyrus.properties.uml.modelelement.StereotypeAppearanceFactory"/>

-  <constraintTypes label="UML Instance Of" constraintClass="org.eclipse.papyrus.properties.uml.constraints.UmlInstanceOfConstraint"/>

-  <constraintTypes label="Has Stereotype" constraintClass="org.eclipse.papyrus.properties.uml.constraints.HasStereotypeConstraint"/>

-  <propertyEditorTypes label="ExpressionEditor" widgetClass="ExpressionEditor" namespace="//@namespaces.0" multiplicity="-1"/>

-  <propertyEditorTypes label="Profile Application Editor" widgetClass="ProfileApplicationPropertyEditor" namespace="//@namespaces.0" type="Reference" multiplicity="-1"/>

-  <propertyEditorTypes label="StereotypeDisplayEditor" widgetClass="StereotypeDisplay" namespace="//@namespaces.0" type="Reference"/>

-  <propertyEditorTypes label="Stereotype Application Editor" widgetClass="StereotypeApplication" namespace="//@namespaces.0" type="Reference" multiplicity="-1"/>

-  <propertyEditorTypes label="Image content Editor" widgetClass="StereotypeImageEditor" namespace="//@namespaces.0"/>

-  <namespaces prefix="clr-namespace" name="uml" value="org.eclipse.papyrus.properties.uml.widgets"/>

-</environment:Environment>