Bug 513695 - [Tooling] Remove workaround for simple direct editing of

Port, introduced by Bug 513060

*removing the workaround which consists in adding a configuration with
the same name as the xtext one with higher priority to be sure it will
be applied in the context of the UML RT language. After fixing Bug
513583, this workaround is no longer needed. we change then the
configuration langauge from Advanced Port Textual Editor to UML-RT and
change the priority to highest

Change-Id: I7b989c4bf44f9b0c08f08fcf5a5aa7ec4e20d729
Signed-off-by: Asma Smaoui <asma.smaoui@cea.fr>

3 files changed, 7 insertions, 7 deletions

diff --git a/plugins/umlrt/tooling/org.eclipse.papyrusrt.umlrt.tooling.modelexplorer/plugin.xml b/plugins/umlrt/tooling/org.eclipse.papyrusrt.umlrt.tooling.modelexplorer/plugin.xml
index 0a9089ae8..656045782 100644
--- a/plugins/umlrt/tooling/org.eclipse.papyrusrt.umlrt.tooling.modelexplorer/plugin.xml
+++ b/plugins/umlrt/tooling/org.eclipse.papyrusrt.umlrt.tooling.modelexplorer/plugin.xml
@@ -87,13 +87,13 @@
    <extension
          point="org.eclipse.papyrus.extensionpoints.editors.DirectEditor">
       <DirectEditor
-            language="Advanced Port Textual Editor"
+            language="UML-RT"
             objectToEdit="org.eclipse.uml2.uml.Port">
          <Priority
-               name="High">
+               name="Highest">
          </Priority>
          <simpleeditor
-               editorConfiguration="org.eclipse.papyrusrt.umlrt.tooling.modelexplorer.preferences.PropertyDirectEditorConfiguration">
+               editorConfiguration="org.eclipse.papyrusrt.umlrt.tooling.modelexplorer.preferences.RTPortDirectEditorConfiguration">
          </simpleeditor>
       </DirectEditor>
    </extension>
diff --git a/plugins/umlrt/tooling/org.eclipse.papyrusrt.umlrt.tooling.modelexplorer/src/org/eclipse/papyrusrt/umlrt/tooling/modelexplorer/preferences/PropertyDirectEditorConfiguration.java b/plugins/umlrt/tooling/org.eclipse.papyrusrt.umlrt.tooling.modelexplorer/src/org/eclipse/papyrusrt/umlrt/tooling/modelexplorer/preferences/RTPortDirectEditorConfiguration.java
index 3f224f47d..f93139bd3 100644
--- a/plugins/umlrt/tooling/org.eclipse.papyrusrt.umlrt.tooling.modelexplorer/src/org/eclipse/papyrusrt/umlrt/tooling/modelexplorer/preferences/PropertyDirectEditorConfiguration.java
+++ b/plugins/umlrt/tooling/org.eclipse.papyrusrt.umlrt.tooling.modelexplorer/src/org/eclipse/papyrusrt/umlrt/tooling/modelexplorer/preferences/RTPortDirectEditorConfiguration.java
@@ -20,7 +20,7 @@ import org.eclipse.uml2.uml.NamedElement;
 /**
  * Specific editor for UML-RT Port. By default, this is a simple direct editor.
  */
-public class PropertyDirectEditorConfiguration extends AbstractBasicDirectEditorConfiguration {
+public class RTPortDirectEditorConfiguration extends AbstractBasicDirectEditorConfiguration {
 
 
 	@Override
@@ -34,7 +34,7 @@ public class PropertyDirectEditorConfiguration extends AbstractBasicDirectEditor
 
 	@Override
 	public IParser createDirectEditorParser() {
-		return new PropertyDirectEditorParser(getTextToEdit(objectToEdit));
+		return new UMLRTElementDirectEditorParser(getTextToEdit(objectToEdit));
 	}
 
 
diff --git a/plugins/umlrt/tooling/org.eclipse.papyrusrt.umlrt.tooling.modelexplorer/src/org/eclipse/papyrusrt/umlrt/tooling/modelexplorer/preferences/PropertyDirectEditorParser.java b/plugins/umlrt/tooling/org.eclipse.papyrusrt.umlrt.tooling.modelexplorer/src/org/eclipse/papyrusrt/umlrt/tooling/modelexplorer/preferences/UMLRTElementDirectEditorParser.java
index 4e3a721aa..0684ed610 100644
--- a/plugins/umlrt/tooling/org.eclipse.papyrusrt.umlrt.tooling.modelexplorer/src/org/eclipse/papyrusrt/umlrt/tooling/modelexplorer/preferences/PropertyDirectEditorParser.java
+++ b/plugins/umlrt/tooling/org.eclipse.papyrusrt.umlrt.tooling.modelexplorer/src/org/eclipse/papyrusrt/umlrt/tooling/modelexplorer/preferences/UMLRTElementDirectEditorParser.java
@@ -28,7 +28,7 @@ import org.eclipse.uml2.uml.UMLPackage;
 /**
  * Specific Parser for the Named Element.
  */
-public class PropertyDirectEditorParser implements IParser {
+public class UMLRTElementDirectEditorParser implements IParser {
 
 	/**
 	 * Name of the current Name Element.
@@ -39,7 +39,7 @@ public class PropertyDirectEditorParser implements IParser {
 	 * Constructor.
 	 *
 	 */
-	public PropertyDirectEditorParser(final String textToEdit) {
+	public UMLRTElementDirectEditorParser(final String textToEdit) {
 		this.textToEdit = textToEdit;
 	}