Bug 512809 - [Tooling] Improve and simplify the embedded editor for

ports and capsule parts

* add a customized embedded editor for CapsulePart : only capsule part
have a simplified direct editor other properties would keep the xtext
editor

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

3 files changed, 64 insertions, 1 deletions

diff --git a/plugins/umlrt/tooling/org.eclipse.papyrusrt.umlrt.tooling.modelexplorer/META-INF/MANIFEST.MF b/plugins/umlrt/tooling/org.eclipse.papyrusrt.umlrt.tooling.modelexplorer/META-INF/MANIFEST.MF
index b6e89db2d..7258a8727 100644
--- a/plugins/umlrt/tooling/org.eclipse.papyrusrt.umlrt.tooling.modelexplorer/META-INF/MANIFEST.MF
+++ b/plugins/umlrt/tooling/org.eclipse.papyrusrt.umlrt.tooling.modelexplorer/META-INF/MANIFEST.MF
@@ -40,7 +40,8 @@ Require-Bundle: org.eclipse.ui;bundle-version="[3.109.0,4.0.0)",
  org.eclipse.papyrus.infra.ui.emf;bundle-version="[2.0.0,3.0.0)",
  org.eclipse.papyrusrt.umlrt.tooling.ui;bundle-version="[0.9.0,1.0.0)",
  org.eclipse.papyrus.views.modelexplorer.newchild;bundle-version="[1.2.0,2.0.0)",
- org.eclipse.papyrusrt.umlrt.uml;bundle-version="[0.9.0,1.0.0)"
+ org.eclipse.papyrusrt.umlrt.uml;bundle-version="[0.9.0,1.0.0)",
+ org.eclipse.papyrus.uml.textedit.property.xtext.ui;bundle-version="[2.0.0,3.0.0)"
 Bundle-ManifestVersion: 2
 Bundle-Activator: org.eclipse.papyrusrt.umlrt.tooling.modelexplorer.Activator
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
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 54285a3fe..552644bfb 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
@@ -90,6 +90,16 @@
                editorConfiguration="org.eclipse.papyrusrt.umlrt.tooling.modelexplorer.preferences.RTPortDirectEditorConfiguration">
          </simpleeditor>
       </DirectEditor>
+       <DirectEditor
+            language="UML RT"
+            objectToEdit="org.eclipse.uml2.uml.Property">
+         <Priority
+               name="Highest">
+         </Priority>
+         <simpleeditor
+               editorConfiguration="org.eclipse.papyrusrt.umlrt.tooling.modelexplorer.preferences.CapsulePartDirectEditorConfiguration">
+         </simpleeditor>
+      </DirectEditor>
    </extension>
    <extension
          point="org.eclipse.papyrus.infra.architecture.models">
diff --git a/plugins/umlrt/tooling/org.eclipse.papyrusrt.umlrt.tooling.modelexplorer/src/org/eclipse/papyrusrt/umlrt/tooling/modelexplorer/preferences/CapsulePartDirectEditorConfiguration.java b/plugins/umlrt/tooling/org.eclipse.papyrusrt.umlrt.tooling.modelexplorer/src/org/eclipse/papyrusrt/umlrt/tooling/modelexplorer/preferences/CapsulePartDirectEditorConfiguration.java
new file mode 100644
index 000000000..4bce27a37
--- /dev/null
+++ b/plugins/umlrt/tooling/org.eclipse.papyrusrt.umlrt.tooling.modelexplorer/src/org/eclipse/papyrusrt/umlrt/tooling/modelexplorer/preferences/CapsulePartDirectEditorConfiguration.java
@@ -0,0 +1,52 @@
+/*****************************************************************************
+ * Copyright (c) 2017 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
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *   CEA LIST - Initial API and implementation
+ *   
+ *****************************************************************************/
+
+package org.eclipse.papyrusrt.umlrt.tooling.modelexplorer.preferences;
+
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;
+import org.eclipse.papyrus.uml.textedit.property.xtext.ui.contributions.PropertyXtextDirectEditorConfiguration;
+import org.eclipse.papyrusrt.umlrt.core.utils.CapsulePartUtils;
+import org.eclipse.uml2.uml.Property;
+
+/**
+ * Specific editor for UML-RT Port. By default, this is a simple direct editor.
+ */
+public class CapsulePartDirectEditorConfiguration extends PropertyXtextDirectEditorConfiguration {
+
+
+	@Override
+	public String getTextToEdit(final Object objectToEdit) {
+
+
+		if (CapsulePartUtils.isCapsulePart((Property) objectToEdit)) {
+			return ((Property) objectToEdit).getName();
+		} else {
+			return super.getTextToEdit(objectToEdit);
+		}
+	}
+
+	@Override
+	public IParser createParser(final EObject semanticObject) {
+		if (CapsulePartUtils.isCapsulePart((Property) semanticObject)) {
+			return new UMLRTElementDirectEditorParser(getTextToEdit(objectToEdit));
+		} else {
+			return super.createParser(semanticObject);
+		}
+
+	}
+
+
+
+
+}