summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBenoit Maggi2014-06-24 04:22:59 (EDT)
committerCamille Letavernier2014-07-21 08:32:28 (EDT)
commitb1dda54b2101f59358f48a0b0cfb2495291a123e (patch)
treec8dbb6d8a3d14ddc162a518276bc3b6da16c2906
parent8e8434454d81efa2d9a8487f40c63aa9914e966d (diff)
downloadorg.eclipse.papyrus-b1dda54b2101f59358f48a0b0cfb2495291a123e.zip
org.eclipse.papyrus-b1dda54b2101f59358f48a0b0cfb2495291a123e.tar.gz
org.eclipse.papyrus-b1dda54b2101f59358f48a0b0cfb2495291a123e.tar.bz2
Bug 435511 - [OCL in Papyrus] OCL XText editor is broken in diagramsrefs/changes/19/28319/5
This priority policy has been defined so that: - an external contribution is NOT the default editor with the classic configuration (LOW) - an external contribution can be set to default editor(use High or Highest) To achieve that: - the default priority is set to low - Papyrus editors priority is set to medium - Papyrus editors, defined to be the default ones, their priority is set at medium Change-Id: I70f72843ad8c97cd0ab430a378976d6f98cd80a2 Signed-off-by: Benoit Maggi <benoit.maggi@cea.fr>
-rw-r--r--extraplugins/marte/textedit/org.eclipse.papyrus.marte.textedit.constraintwithvsl.xtext.ui/plugin.xml2
-rw-r--r--plugins/infra/gmfdiag/org.eclipse.papyrus.extensionpoints.editors/schema/DirectEditor.exsd470
-rw-r--r--plugins/infra/gmfdiag/org.eclipse.papyrus.extensionpoints.editors/src/org/eclipse/papyrus/extensionpoints/editors/definition/DirectEditorExtensionPoint.java19
-rw-r--r--plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.collaborationuse.xtext.ui/plugin.xml3
-rw-r--r--plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.connectionpointreference.xtext.ui/plugin.xml3
-rw-r--r--plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.constraintwithessentialocl.xtext/plugin.xml62
-rw-r--r--plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.javaconstraint/plugin.xml35
-rw-r--r--plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.message.xtext.ui/plugin.xml4
-rw-r--r--plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.parameter.xtext.ui/plugin.xml3
-rw-r--r--plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.port.xtext.ui/plugin.xml3
-rw-r--r--plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.property.xtext.ui/plugin.xml3
-rwxr-xr-xplugins/uml/textedit/org.eclipse.papyrus.uml.textedit.state.xtext.ui/plugin.xml3
-rw-r--r--plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.stereotypeproperty.xtext.ui/plugin.xml3
-rw-r--r--plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.transition.xtext.ui/plugin.xml3
14 files changed, 327 insertions, 289 deletions
diff --git a/extraplugins/marte/textedit/org.eclipse.papyrus.marte.textedit.constraintwithvsl.xtext.ui/plugin.xml b/extraplugins/marte/textedit/org.eclipse.papyrus.marte.textedit.constraintwithvsl.xtext.ui/plugin.xml
index 702c20f..520d1b3 100644
--- a/extraplugins/marte/textedit/org.eclipse.papyrus.marte.textedit.constraintwithvsl.xtext.ui/plugin.xml
+++ b/extraplugins/marte/textedit/org.eclipse.papyrus.marte.textedit.constraintwithvsl.xtext.ui/plugin.xml
@@ -190,6 +190,8 @@
<popupeditor
editorConfiguration="org.eclipse.papyrus.marte.textedit.constraintwithvsl.xtext.ui.contributions.ConstraintWithVSLPopupEditorConfiguration">
</popupeditor>
+ <Priority name="Lowest">
+ </Priority>
</DirectEditor>
</extension>
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.extensionpoints.editors/schema/DirectEditor.exsd b/plugins/infra/gmfdiag/org.eclipse.papyrus.extensionpoints.editors/schema/DirectEditor.exsd
index 980ba9f..12fa221 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.extensionpoints.editors/schema/DirectEditor.exsd
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.extensionpoints.editors/schema/DirectEditor.exsd
@@ -1,235 +1,235 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!-- Schema file written by PDE -->
-<schema targetNamespace="org.eclipse.papyrus.extensionpoints.editors" xmlns="http://www.w3.org/2001/XMLSchema">
-<annotation>
- <appInfo>
- <meta.schema plugin="org.eclipse.papyrus.extensionpoints.editors" id="DirectEditor" name="Extension Poin that defines new editors for specific objects and specific language in Papyrus"/>
- </appInfo>
- <documentation>
- This extension point is used to registered new editors into Papyrus modeling tool to edit objects using a given language.
- </documentation>
- </annotation>
-
- <element name="extension">
- <annotation>
- <appInfo>
- <meta.element />
- </appInfo>
- </annotation>
- <complexType>
- <sequence minOccurs="1" maxOccurs="unbounded">
- <element ref="DirectEditor"/>
- </sequence>
- <attribute name="point" type="string" use="required">
- <annotation>
- <documentation>
-
- </documentation>
- </annotation>
- </attribute>
- <attribute name="id" type="string">
- <annotation>
- <documentation>
-
- </documentation>
- </annotation>
- </attribute>
- <attribute name="name" type="string">
- <annotation>
- <documentation>
-
- </documentation>
- <appInfo>
- <meta.attribute translatable="true"/>
- </appInfo>
- </annotation>
- </attribute>
- </complexType>
- </element>
-
- <element name="DirectEditor">
- <annotation>
- <appInfo>
- <meta.element labelAttribute="objectToEdit"/>
- </appInfo>
- <documentation>
- Extension points for direct editors in Papyrus UML2.
- </documentation>
- </annotation>
- <complexType>
- <sequence>
- <choice>
- <element ref="advancededitor"/>
- <element ref="simpleeditor"/>
- <element ref="popupeditor"/>
- </choice>
- <element ref="Priority" minOccurs="0" maxOccurs="1"/>
- </sequence>
- <attribute name="language" type="string" use="required">
- <annotation>
- <documentation>
- language used to edit the specified object
- </documentation>
- </annotation>
- </attribute>
- <attribute name="objectToEdit" type="string" use="required">
- <annotation>
- <documentation>
- the qualified type of object to edit (for example, &quot;java.lang.Object&quot;)
- </documentation>
- </annotation>
- </attribute>
- <attribute name="icon" type="string">
- <annotation>
- <documentation>
- Icon used in menus for this editor
- </documentation>
- <appInfo>
- <meta.attribute kind="resource"/>
- </appInfo>
- </annotation>
- </attribute>
- <attribute name="contributor" type="string">
- <annotation>
- <documentation>
- Name of the contributor for this extension point
- </documentation>
- </annotation>
- </attribute>
- </complexType>
- </element>
-
- <element name="simpleeditor">
- <complexType>
- <attribute name="editorConfiguration" type="string" use="required">
- <annotation>
- <documentation>
- The class that configure the direct editor
- </documentation>
- <appInfo>
- <meta.attribute kind="java" basedOn=":org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration"/>
- </appInfo>
- </annotation>
- </attribute>
- </complexType>
- </element>
-
- <element name="advancededitor">
- <complexType>
- <attribute name="editorConfiguration" type="string" use="required">
- <annotation>
- <documentation>
- The class that configure the direct editor
- </documentation>
- <appInfo>
- <meta.attribute kind="java" basedOn="org.eclipse.jface.dialogs.Dialog:"/>
- </appInfo>
- </annotation>
- </attribute>
- </complexType>
- </element>
-
- <element name="popupeditor">
- <annotation>
- <documentation>
- This extension point can be used to register a popup editor
- </documentation>
- </annotation>
- <complexType>
- <attribute name="editorConfiguration" type="string">
- <annotation>
- <documentation>
-
- </documentation>
- <appInfo>
- <meta.attribute kind="java" basedOn=":org.eclipse.papyrus.extensionpoints.editors.configuration.IPopupEditorConfiguration"/>
- </appInfo>
- </annotation>
- </attribute>
- </complexType>
- </element>
-
- <element name="Priority">
- <annotation>
- <documentation>
- The description for the priority of the editpart provider
- </documentation>
- </annotation>
- <complexType>
- <attribute name="name" use="required">
- <annotation>
- <documentation>
- The priority of the provider. It can be one of the following values:
-&lt;Lowest, Low, Medium, High, Highest&gt;. Consideration of dependencies has to be done when choosing the priority. A provider at a higher priority will take a chance first at deciding provision.
- </documentation>
- </annotation>
- <simpleType>
- <restriction base="string">
- <enumeration value="Lowest">
- </enumeration>
- <enumeration value="Low">
- </enumeration>
- <enumeration value="Medium">
- </enumeration>
- <enumeration value="High">
- </enumeration>
- <enumeration value="Highest">
- </enumeration>
- </restriction>
- </simpleType>
- </attribute>
- </complexType>
- </element>
-
- <annotation>
- <appInfo>
- <meta.section type="apiInfo"/>
- </appInfo>
- <documentation>
- [Enter API information here.]
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="since"/>
- </appInfo>
- <documentation>
- Since 1.9.0
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="examples"/>
- </appInfo>
- <documentation>
- [Enter extension point usage example here.]
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="implementation"/>
- </appInfo>
- <documentation>
- [Enter information about supplied implementation of this extension point.]
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="copyright"/>
- </appInfo>
- <documentation>
- Copyright (c) 2008 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
-http://www.eclipse.org/legal/epl-v10.html
-Contributors:
-CEA LIST - initial API and implementation
- </documentation>
- </annotation>
-
-</schema>
+<?xml version='1.0' encoding='UTF-8'?>
+<!-- Schema file written by PDE -->
+<schema targetNamespace="org.eclipse.papyrus.extensionpoints.editors" xmlns="http://www.w3.org/2001/XMLSchema">
+<annotation>
+ <appInfo>
+ <meta.schema plugin="org.eclipse.papyrus.extensionpoints.editors" id="DirectEditor" name="Extension Poin that defines new editors for specific objects and specific language in Papyrus"/>
+ </appInfo>
+ <documentation>
+ This extension point is used to registered new editors into Papyrus modeling tool to edit objects using a given language.
+ </documentation>
+ </annotation>
+
+ <element name="extension">
+ <annotation>
+ <appInfo>
+ <meta.element />
+ </appInfo>
+ </annotation>
+ <complexType>
+ <sequence minOccurs="1" maxOccurs="unbounded">
+ <element ref="DirectEditor"/>
+ </sequence>
+ <attribute name="point" type="string" use="required">
+ <annotation>
+ <documentation>
+
+ </documentation>
+ </annotation>
+ </attribute>
+ <attribute name="id" type="string">
+ <annotation>
+ <documentation>
+
+ </documentation>
+ </annotation>
+ </attribute>
+ <attribute name="name" type="string">
+ <annotation>
+ <documentation>
+
+ </documentation>
+ <appInfo>
+ <meta.attribute translatable="true"/>
+ </appInfo>
+ </annotation>
+ </attribute>
+ </complexType>
+ </element>
+
+ <element name="DirectEditor">
+ <annotation>
+ <appInfo>
+ <meta.element labelAttribute="objectToEdit"/>
+ </appInfo>
+ <documentation>
+ Extension points for direct editors in Papyrus UML2.
+ </documentation>
+ </annotation>
+ <complexType>
+ <sequence>
+ <choice>
+ <element ref="advancededitor"/>
+ <element ref="simpleeditor"/>
+ <element ref="popupeditor"/>
+ </choice>
+ <element ref="Priority" minOccurs="0" maxOccurs="1"/>
+ </sequence>
+ <attribute name="language" type="string" use="required">
+ <annotation>
+ <documentation>
+ language used to edit the specified object
+ </documentation>
+ </annotation>
+ </attribute>
+ <attribute name="objectToEdit" type="string" use="required">
+ <annotation>
+ <documentation>
+ the qualified type of object to edit (for example, &quot;java.lang.Object&quot;)
+ </documentation>
+ </annotation>
+ </attribute>
+ <attribute name="icon" type="string">
+ <annotation>
+ <documentation>
+ Icon used in menus for this editor
+ </documentation>
+ <appInfo>
+ <meta.attribute kind="resource"/>
+ </appInfo>
+ </annotation>
+ </attribute>
+ <attribute name="contributor" type="string">
+ <annotation>
+ <documentation>
+ Name of the contributor for this extension point
+ </documentation>
+ </annotation>
+ </attribute>
+ </complexType>
+ </element>
+
+ <element name="simpleeditor">
+ <complexType>
+ <attribute name="editorConfiguration" type="string" use="required">
+ <annotation>
+ <documentation>
+ The class that configure the direct editor
+ </documentation>
+ <appInfo>
+ <meta.attribute kind="java" basedOn=":org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration"/>
+ </appInfo>
+ </annotation>
+ </attribute>
+ </complexType>
+ </element>
+
+ <element name="advancededitor">
+ <complexType>
+ <attribute name="editorConfiguration" type="string" use="required">
+ <annotation>
+ <documentation>
+ The class that configure the direct editor
+ </documentation>
+ <appInfo>
+ <meta.attribute kind="java" basedOn="org.eclipse.jface.dialogs.Dialog:"/>
+ </appInfo>
+ </annotation>
+ </attribute>
+ </complexType>
+ </element>
+
+ <element name="popupeditor">
+ <annotation>
+ <documentation>
+ This extension point can be used to register a popup editor
+ </documentation>
+ </annotation>
+ <complexType>
+ <attribute name="editorConfiguration" type="string">
+ <annotation>
+ <documentation>
+
+ </documentation>
+ <appInfo>
+ <meta.attribute kind="java" basedOn=":org.eclipse.papyrus.extensionpoints.editors.configuration.IPopupEditorConfiguration"/>
+ </appInfo>
+ </annotation>
+ </attribute>
+ </complexType>
+ </element>
+
+ <element name="Priority">
+ <annotation>
+ <documentation>
+ The description for the priority of the editpart provider
+ </documentation>
+ </annotation>
+ <complexType>
+ <attribute name="name" use="default" value="Low">
+ <annotation>
+ <documentation>
+ The priority of the provider. It can be one of the following values:
+&lt;Lowest, Low, Medium, High, Highest&gt;. Consideration of dependencies has to be done when choosing the priority. A provider at a higher priority will take a chance first at deciding provision.
+ </documentation>
+ </annotation>
+ <simpleType>
+ <restriction base="string">
+ <enumeration value="Lowest">
+ </enumeration>
+ <enumeration value="Low">
+ </enumeration>
+ <enumeration value="Medium">
+ </enumeration>
+ <enumeration value="High">
+ </enumeration>
+ <enumeration value="Highest">
+ </enumeration>
+ </restriction>
+ </simpleType>
+ </attribute>
+ </complexType>
+ </element>
+
+ <annotation>
+ <appInfo>
+ <meta.section type="apiInfo"/>
+ </appInfo>
+ <documentation>
+ [Enter API information here.]
+ </documentation>
+ </annotation>
+
+ <annotation>
+ <appInfo>
+ <meta.section type="since"/>
+ </appInfo>
+ <documentation>
+ Since 1.9.0
+ </documentation>
+ </annotation>
+
+ <annotation>
+ <appInfo>
+ <meta.section type="examples"/>
+ </appInfo>
+ <documentation>
+ [Enter extension point usage example here.]
+ </documentation>
+ </annotation>
+
+ <annotation>
+ <appInfo>
+ <meta.section type="implementation"/>
+ </appInfo>
+ <documentation>
+ [Enter information about supplied implementation of this extension point.]
+ </documentation>
+ </annotation>
+
+ <annotation>
+ <appInfo>
+ <meta.section type="copyright"/>
+ </appInfo>
+ <documentation>
+ Copyright (c) 2008 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
+http://www.eclipse.org/legal/epl-v10.html
+Contributors:
+CEA LIST - initial API and implementation
+ </documentation>
+ </annotation>
+
+</schema>
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.extensionpoints.editors/src/org/eclipse/papyrus/extensionpoints/editors/definition/DirectEditorExtensionPoint.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.extensionpoints.editors/src/org/eclipse/papyrus/extensionpoints/editors/definition/DirectEditorExtensionPoint.java
index 10ab10e..bcc46e9 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.extensionpoints.editors/src/org/eclipse/papyrus/extensionpoints/editors/definition/DirectEditorExtensionPoint.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.extensionpoints.editors/src/org/eclipse/papyrus/extensionpoints/editors/definition/DirectEditorExtensionPoint.java
@@ -253,9 +253,17 @@ public class DirectEditorExtensionPoint {
return javaQuery;
}
-
+ /**
+ * This priority policy has been defined so that:
+ * - an external contribution is NOT the default editor with the classic configuration (LOW)
+ * - an external contribution can be set to default editor(use High or Highest)
+ *
+ * To achieve that:
+ * - the default priority is set to low
+ * - Papyrus editors priority is set to medium
+ * - Papyrus editors, defined to be the default ones, their priority is set at medium
+ */
protected static Integer getPriority(IConfigurationElement configElement) {
- IAdvancedEditorConfiguration configuration = null;
try {
for(IConfigurationElement childConfigElement : configElement.getChildren(IDirectEditorConfigurationIds.ATT_PRIORITY)) {
@@ -275,14 +283,11 @@ public class DirectEditorExtensionPoint {
if(config.equals(IDirectEditorConfigurationIds.PRIORITY_LOWEST)) {
return new Integer(4);
}
- System.out.println(config);
}
-
} catch (Exception e) {
Activator.log.error(e);
- configuration = null;
}
- return new Integer(5);
+ return new Integer(3); // PRIORITY_LOW
}
@@ -359,7 +364,7 @@ public class DirectEditorExtensionPoint {
}
if(isRequired) {
- throw new IllegalArgumentException("Missing " + name + " attribute");
+ throw new IllegalArgumentException("Missing " + name + " attribute"); //$NON-NLS-1$ //$NON-NLS-2$
}
return null;
diff --git a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.collaborationuse.xtext.ui/plugin.xml b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.collaborationuse.xtext.ui/plugin.xml
index d86d634..f47707d 100644
--- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.collaborationuse.xtext.ui/plugin.xml
+++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.collaborationuse.xtext.ui/plugin.xml
@@ -191,6 +191,9 @@
<popupeditor
editorConfiguration="org.eclipse.papyrus.uml.textedit.collaborationuse.xtext.ui.contributions.CollaborationUseEditor">
</popupeditor>
+ <Priority
+ name="Medium">
+ </Priority>
</DirectEditor>
</extension>
diff --git a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.connectionpointreference.xtext.ui/plugin.xml b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.connectionpointreference.xtext.ui/plugin.xml
index feaea1f..0bb9e0f 100644
--- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.connectionpointreference.xtext.ui/plugin.xml
+++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.connectionpointreference.xtext.ui/plugin.xml
@@ -191,6 +191,9 @@
<popupeditor
editorConfiguration="org.eclipse.papyrus.uml.textedit.connectionpointreference.xtext.ui.contributions.ConnectionPointReferenceEditorConfiguration">
</popupeditor>
+ <Priority
+ name="Medium">
+ </Priority>
</DirectEditor>
</extension>
diff --git a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.constraintwithessentialocl.xtext/plugin.xml b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.constraintwithessentialocl.xtext/plugin.xml
index 7491bcb..dd89628 100644
--- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.constraintwithessentialocl.xtext/plugin.xml
+++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.constraintwithessentialocl.xtext/plugin.xml
@@ -1,31 +1,31 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.4"?>
-<plugin>
- <extension
- point="org.eclipse.papyrus.extensionpoints.editors.DirectEditor">
- <DirectEditor
- contributor="Eclipse Modeling Project"
- icon="icons/OCLModelFile.gif"
- language="Essential OCL constraint editor"
- objectToEdit="org.eclipse.uml2.uml.Constraint">
- <popupeditor
- editorConfiguration="org.eclipse.papyrus.uml.textedit.constraintwithessentialocl.xtext.EssentialOCLEditorConfiguration">
- </popupeditor>
- <Priority
- name="High">
- </Priority>
- </DirectEditor>
- <DirectEditor
- contributor="Eclipse Modeling Project"
- icon="icons/OCLModelFile.gif"
- language="Essential OCL constraint editor"
- objectToEdit="org.eclipse.uml2.uml.OpaqueExpression">
- <popupeditor
- editorConfiguration="org.eclipse.papyrus.uml.textedit.constraintwithessentialocl.xtext.EssentialOCLEditorConfiguration">
- </popupeditor>
- <Priority
- name="High">
- </Priority>
- </DirectEditor>
- </extension>
-</plugin>
+<?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.4"?>
+<plugin>
+ <extension
+ point="org.eclipse.papyrus.extensionpoints.editors.DirectEditor">
+ <DirectEditor
+ contributor="Eclipse Modeling Project"
+ icon="icons/OCLModelFile.gif"
+ language="Essential OCL constraint editor"
+ objectToEdit="org.eclipse.uml2.uml.Constraint">
+ <popupeditor
+ editorConfiguration="org.eclipse.papyrus.uml.textedit.constraintwithessentialocl.xtext.EssentialOCLEditorConfiguration">
+ </popupeditor>
+ <Priority
+ name="High">
+ </Priority>
+ </DirectEditor>
+ <DirectEditor
+ contributor="Eclipse Modeling Project"
+ icon="icons/OCLModelFile.gif"
+ language="Essential OCL constraint editor"
+ objectToEdit="org.eclipse.uml2.uml.OpaqueExpression">
+ <popupeditor
+ editorConfiguration="org.eclipse.papyrus.uml.textedit.constraintwithessentialocl.xtext.EssentialOCLEditorConfiguration">
+ </popupeditor>
+ <Priority
+ name="High">
+ </Priority>
+ </DirectEditor>
+ </extension>
+</plugin>
diff --git a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.javaconstraint/plugin.xml b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.javaconstraint/plugin.xml
index 2cec395..6d49b54 100644
--- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.javaconstraint/plugin.xml
+++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.javaconstraint/plugin.xml
@@ -1,16 +1,19 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.4"?>
-<plugin>
- <extension
- point="org.eclipse.papyrus.extensionpoints.editors.DirectEditor">
- <DirectEditor
- contributor="Eclipse Modeling Project"
- language="JAVA constraint"
- objectToEdit="org.eclipse.uml2.uml.Constraint">
- <simpleeditor
- editorConfiguration="org.eclipse.papyrus.uml.textedit.javaconstraint.JavaDirectEditorConfiguration">
- </simpleeditor>
- </DirectEditor>
- </extension>
-
-</plugin>
+<?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.4"?>
+<plugin>
+ <extension
+ point="org.eclipse.papyrus.extensionpoints.editors.DirectEditor">
+ <DirectEditor
+ contributor="Eclipse Modeling Project"
+ language="JAVA constraint"
+ objectToEdit="org.eclipse.uml2.uml.Constraint">
+ <simpleeditor
+ editorConfiguration="org.eclipse.papyrus.uml.textedit.javaconstraint.JavaDirectEditorConfiguration">
+ </simpleeditor>
+ <Priority
+ name="Medium">
+ </Priority>
+ </DirectEditor>
+ </extension>
+
+</plugin>
diff --git a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.message.xtext.ui/plugin.xml b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.message.xtext.ui/plugin.xml
index 18f10f5..5a6aa07 100644
--- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.message.xtext.ui/plugin.xml
+++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.message.xtext.ui/plugin.xml
@@ -234,7 +234,11 @@
objectToEdit="org.eclipse.uml2.uml.Message">
<popupeditor
editorConfiguration="org.eclipse.papyrus.uml.textedit.message.xtext.ui.contributions.MessagePopupEditor"></popupeditor>
+ <Priority
+ name="Medium">
+ </Priority>
</DirectEditor>
+
</extension>
</plugin>
diff --git a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.parameter.xtext.ui/plugin.xml b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.parameter.xtext.ui/plugin.xml
index f379392..ca534d9 100644
--- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.parameter.xtext.ui/plugin.xml
+++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.parameter.xtext.ui/plugin.xml
@@ -235,6 +235,9 @@
<popupeditor
editorConfiguration="org.eclipse.papyrus.uml.textedit.parameter.xtext.ui.contributions.ParameterXtextDirectEditorConfiguration">
</popupeditor>
+ <Priority
+ name="Medium">
+ </Priority>
</DirectEditor>
</extension>
diff --git a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.port.xtext.ui/plugin.xml b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.port.xtext.ui/plugin.xml
index 9d17cc9..16cebac 100644
--- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.port.xtext.ui/plugin.xml
+++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.port.xtext.ui/plugin.xml
@@ -350,6 +350,9 @@
<popupeditor
editorConfiguration="org.eclipse.papyrus.uml.textedit.port.xtext.ui.contribution.PortXtextDirectEditorConfiguration">
</popupeditor>
+ <Priority
+ name="Medium">
+ </Priority>
</DirectEditor>
</extension>
diff --git a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.property.xtext.ui/plugin.xml b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.property.xtext.ui/plugin.xml
index 1ba6fce..e280153 100644
--- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.property.xtext.ui/plugin.xml
+++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.property.xtext.ui/plugin.xml
@@ -209,6 +209,9 @@
<popupeditor
editorConfiguration="org.eclipse.papyrus.uml.textedit.property.xtext.ui.contributions.PropertyXtextDirectEditorConfiguration">
</popupeditor>
+ <Priority
+ name="Medium">
+ </Priority>
</DirectEditor>
</extension>
diff --git a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.state.xtext.ui/plugin.xml b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.state.xtext.ui/plugin.xml
index 74e158d..c8cc9d3 100755
--- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.state.xtext.ui/plugin.xml
+++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.state.xtext.ui/plugin.xml
@@ -235,6 +235,9 @@
<popupeditor
editorConfiguration="org.eclipse.papyrus.uml.textedit.state.xtext.ui.contributions.StateEditorConfigurationContribution">
</popupeditor>
+ <Priority
+ name="Medium">
+ </Priority>
</DirectEditor>
</extension>
diff --git a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.stereotypeproperty.xtext.ui/plugin.xml b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.stereotypeproperty.xtext.ui/plugin.xml
index 59ddce5..d76da2e 100644
--- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.stereotypeproperty.xtext.ui/plugin.xml
+++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.stereotypeproperty.xtext.ui/plugin.xml
@@ -236,6 +236,9 @@
<popupeditor
editorConfiguration="org.eclipse.papyrus.uml.textedit.stereotypeproperty.xtext.ui.contributions.StereotypePropertyEditorConfigurationContribution">
</popupeditor>
+ <Priority
+ name="Medium">
+ </Priority>
</DirectEditor>
</extension>
diff --git a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.transition.xtext.ui/plugin.xml b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.transition.xtext.ui/plugin.xml
index 7c211d8..45ffb69 100644
--- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.transition.xtext.ui/plugin.xml
+++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.transition.xtext.ui/plugin.xml
@@ -204,6 +204,9 @@
editorConfiguration="org.eclipse.papyrus.uml.textedit.transition.xtext.ui.contributions.TransitionEditorConfigurationContribution">
</popupeditor>
</DirectEditor>
+ <Priority
+ name="Medium">
+ </Priority>
</extension>
</plugin>