Bug 510889 - [GMFT] Fork gmft.runtime

 - rename the plugin as
org.eclipse.papyrus.infra.gmfdiag.tooling.runtime
 - integrate in Papyrus build 
 - add the plugin to gmfdiag feature  
 - change dependency in infra.gmfdiag.common
 - change xtend templates
 - re-genenerate all diagrams
    - fix missing keys using full namespace
    - fix wrong version number
    - impossible to regenerate InteractionOverview (no gmfgen)
    - Remaining generated not in Activity and Timing 
    - keep hand made code in UMLNavigatorLabelProvider for Sequence
Diagram

Change-Id: I1c1b988eafff38eae56a789d6a8734083c1117d4
Signed-off-by: Benoit Maggi <benoit.maggi@cea.fr>

1 files changed, 21 insertions, 37 deletions

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/NodeEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/NodeEditPartCN.java
index 92c306edc3b..9caed8a4879 100644..100755
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/NodeEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/NodeEditPartCN.java
@@ -1,13 +1,13 @@
 /**

  * Copyright (c) 2014 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

+  * 

+  * 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.papyrus.uml.diagram.deployment.edit.parts;

 

@@ -73,7 +73,6 @@ public class NodeEditPartCN extends NamedElementEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void createDefaultEditPolicies() {

 		super.createDefaultEditPolicies();

 		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultSemanticEditPolicy());

@@ -83,9 +82,12 @@ public class NodeEditPartCN extends NamedElementEditPart {
 		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());

 		installEditPolicy(QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY, new QualifiedNameDisplayEditPolicy());

 		installEditPolicy("REMOVE_ORPHAN_VIEW", new RemoveOrphanViewPolicy()); //$NON-NLS-1$

-		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeNodeLabelDisplayEditPolicy());

-		installEditPolicy(ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY, new ShowHideCompartmentEditPolicy());

-		installEditPolicy(ShowHideClassifierContentsEditPolicy.SHOW_HIDE_CLASSIFIER_CONTENTS_POLICY, new ShowHideClassifierContentsEditPolicy());

+		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY,

+				new AppliedStereotypeNodeLabelDisplayEditPolicy());

+		installEditPolicy(ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY,

+				new ShowHideCompartmentEditPolicy());

+		installEditPolicy(ShowHideClassifierContentsEditPolicy.SHOW_HIDE_CLASSIFIER_CONTENTS_POLICY,

+				new ShowHideClassifierContentsEditPolicy());

 		installEditPolicy("RESIZE_BORDER_ITEMS", new ConstrainedItemBorderLayoutEditPolicy()); //$NON-NLS-1$

 		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new CustomDiagramDragDropEditPolicy());

 		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new CustomGraphicalNodeEditPolicy());

@@ -122,11 +124,9 @@ public class NodeEditPartCN extends NamedElementEditPart {
 	}

 

 	/**

-	 * Papyrus codeGen

-	 *

-	 * @generated

-	 **/

-	@Override

+	*Papyrus codeGen

+	*@generated

+	**/

 	protected void handleNotificationEvent(Notification event) {

 		super.handleNotificationEvent(event);

 

@@ -135,17 +135,14 @@ public class NodeEditPartCN extends NamedElementEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure createNodeShape() {

 		return primaryShape = new NodeFigure();

 	}

 

 	/**

 	 * org.eclipse.papyrus.uml.diagram.deployment.custom.figure.nodes.NodeFigure

-	 *

 	 * @generated

 	 */

-	@Override

 	public NodeFigure getPrimaryShape() {

 		return (NodeFigure) primaryShape;

 	}

@@ -159,7 +156,6 @@ public class NodeEditPartCN extends NamedElementEditPart {
 			return true;

 		}

 

-

 		return false;

 	}

 

@@ -176,7 +172,6 @@ public class NodeEditPartCN extends NamedElementEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void addChildVisual(EditPart childEditPart, int index) {

 		if (addFixedChild(childEditPart)) {

 			return;

@@ -187,7 +182,6 @@ public class NodeEditPartCN extends NamedElementEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void removeChildVisual(EditPart childEditPart) {

 		if (removeFixedChild(childEditPart)) {

 			return;

@@ -198,7 +192,6 @@ public class NodeEditPartCN extends NamedElementEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected IFigure getContentPaneFor(IGraphicalEditPart editPart) {

 		return getContentPane();

 	}

@@ -206,7 +199,6 @@ public class NodeEditPartCN extends NamedElementEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure createNodePlate() {

 		RoundedRectangleNodePlateFigure result = new RoundedRectangleNodePlateFigure(150, 150);

 		return result;

@@ -214,13 +206,12 @@ public class NodeEditPartCN extends NamedElementEditPart {
 

 	/**

 	 * Creates figure for this edit part.

-	 *

+	 * 

 	 * Body of this method does not depend on settings in generation model

 	 * so you may safely remove <i>generated</i> tag and modify it.

-	 *

+	 * 

 	 * @generated

 	 */

-	@Override

 	protected org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure createNodeFigure() {

 		return new SelectableBorderedNodeFigure(createMainFigureWithSVG());

 

@@ -229,12 +220,9 @@ public class NodeEditPartCN extends NamedElementEditPart {
 	/**

 	 * Default implementation treats passed figure as content pane.

 	 * Respects layout one may have set for generated figure.

-	 *

-	 * @param nodeShape

-	 *            instance of generated figure class

+	 * @param nodeShape instance of generated figure class

 	 * @generated

 	 */

-	@Override

 	protected IFigure setupContentPane(IFigure nodeShape) {

 		if (nodeShape.getLayoutManager() == null) {

 			ConstrainedToolbarLayout layout = new ConstrainedToolbarLayout();

@@ -247,7 +235,6 @@ public class NodeEditPartCN extends NamedElementEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	public IFigure getContentPane() {

 		if (contentPane != null) {

 			return contentPane;

@@ -258,7 +245,6 @@ public class NodeEditPartCN extends NamedElementEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setForegroundColor(Color color) {

 		if (primaryShape != null) {

 			primaryShape.setForegroundColor(color);

@@ -268,7 +254,6 @@ public class NodeEditPartCN extends NamedElementEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setLineWidth(int width) {

 		super.setLineWidth(width);

 	}

@@ -276,7 +261,6 @@ public class NodeEditPartCN extends NamedElementEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	protected void setLineType(int style) {

 		if (primaryShape instanceof IPapyrusNodeFigure) {

 			((IPapyrusNodeFigure) primaryShape).setLineStyle(style);

@@ -286,8 +270,8 @@ public class NodeEditPartCN extends NamedElementEditPart {
 	/**

 	 * @generated

 	 */

-	@Override

 	public EditPart getPrimaryChildEditPart() {

 		return getChildBySemanticHint(UMLVisualIDRegistry.getType(NodeNameEditPartCN.VISUAL_ID));

 	}

+

 }