Updated for Sirius 6.2.2

Change-Id: Ia375cabadd685209707a823219f8f3227243c960

plugins/org.etsi.mts.tdl.graphical.viewpoint/src/org/etsi/mts/tdl/graphical/sirius/figure/ViewNodeContainerImageFigureDesc.java

@@ -2,13 +2,15 @@ package org.etsi.mts.tdl.graphical.sirius.figure;
 
 import org.eclipse.draw2d.MarginBorder;
 import org.eclipse.draw2d.geometry.Rectangle;
+import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.sirius.diagram.ui.tools.api.figure.IWorkspaceImageFigure;
 import org.eclipse.sirius.diagram.ui.tools.api.figure.ViewNodeContainerRectangleFigureDesc;
 
 public class ViewNodeContainerImageFigureDesc extends ViewNodeContainerRectangleFigureDesc {
 	
 	
-	public ViewNodeContainerImageFigureDesc() {
+	public ViewNodeContainerImageFigureDesc(View view) {
+		super(view);
 		MarginBorder border = (MarginBorder) getBorder();
 		border.getInsets(this).top = 15;
 		border.getInsets(this).left = 10;

plugins/org.etsi.mts.tdl.graphical.viewpoint/src/org/etsi/mts/tdl/graphical/sirius/part/InteractionUseConfiguringEditPart.java

@@ -3,7 +3,6 @@ package org.etsi.mts.tdl.graphical.sirius.part;
 import java.util.List;
 
 import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.ScrollPane;
 import org.eclipse.draw2d.Shape;
 import org.eclipse.draw2d.StackLayout;
 import org.eclipse.draw2d.XYLayout;
@@ -11,14 +10,13 @@ import org.eclipse.draw2d.geometry.Dimension;
 import org.eclipse.draw2d.geometry.Rectangle;
 import org.eclipse.gmf.runtime.diagram.ui.figures.BorderedNodeFigure;
 import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;
-import org.eclipse.gmf.runtime.gef.ui.figures.DefaultSizeNodeFigure;
 import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;
 import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.sirius.diagram.ui.edit.api.part.AbstractNotSelectableShapeNodeEditPart;
-import org.eclipse.sirius.diagram.ui.tools.api.figure.AbstractTransparentNode;
-import org.eclipse.sirius.diagram.ui.tools.api.figure.ITransparentFigure;
 import org.eclipse.sirius.diagram.ui.tools.api.figure.SVGWorkspaceImageFigure;
-import org.eclipse.sirius.diagram.ui.tools.api.figure.SiriusWrapLabel;
+import org.eclipse.sirius.ext.draw2d.figure.ITransparentFigure;
+import org.eclipse.sirius.ext.gmf.runtime.gef.ui.figures.AbstractTransparentNode;
+import org.eclipse.sirius.ext.gmf.runtime.gef.ui.figures.SiriusWrapLabel;
 
 /**
  * This class should be mapped to an "abstract" sub-node of interaction use. The

plugins/org.etsi.mts.tdl.graphical.viewpoint/src/org/etsi/mts/tdl/graphical/sirius/part/NodeListWithHeaderEditPart.java

@@ -17,7 +17,7 @@ import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;
 import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.sirius.diagram.ui.edit.api.part.AbstractDiagramListEditPart;
 import org.eclipse.sirius.diagram.ui.edit.api.part.IDiagramNameEditPart;
-import org.eclipse.sirius.diagram.ui.tools.api.figure.OneLineMarginBorder;
+import org.eclipse.sirius.ext.gmf.runtime.gef.ui.figures.OneLineMarginBorder;
 import org.etsi.mts.tdl.graphical.sirius.EditPartConfiguration;
 import org.etsi.mts.tdl.graphical.sirius.figure.TwoLineMarginBorder;
 

plugins/org.etsi.mts.tdl.graphical.viewpoint/src/org/etsi/mts/tdl/graphical/sirius/part/TopLevelImageNodeListWithHeaderEditPart.java

@@ -13,7 +13,7 @@ public class TopLevelImageNodeListWithHeaderEditPart extends TopLevelNodeListWit
 	
 	@Override
 	protected IFigure createNodeShape() {
-        IFigure shapeFigure = new ViewNodeContainerImageFigureDesc();
+        IFigure shapeFigure = new ViewNodeContainerImageFigureDesc((View) getAdapter(View.class));
     	return shapeFigure;
 	}
 	

plugins/org.etsi.mts.tdl.graphical.viewpoint/src/org/etsi/mts/tdl/graphical/sirius/part/TopLevelNodeListWithHeaderEditPart.java

@@ -8,8 +8,8 @@ import org.eclipse.gef.DragTracker;
 import org.eclipse.gef.GraphicalEditPart;
 import org.eclipse.gef.Request;
 import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.sirius.diagram.ui.tools.api.figure.SiriusWrapLabel;
 import org.eclipse.sirius.diagram.ui.tools.api.figure.ViewNodeContainerRectangleFigureDesc;
+import org.eclipse.sirius.ext.gmf.runtime.gef.ui.figures.SiriusWrapLabel;
 import org.etsi.mts.tdl.graphical.sirius.EditPartConfiguration;
 
 public class TopLevelNodeListWithHeaderEditPart extends NodeListWithHeaderEditPart {
@@ -21,7 +21,7 @@ public class TopLevelNodeListWithHeaderEditPart extends NodeListWithHeaderEditPa
 	}
 
     protected IFigure createNodeShape() {
-        shapeFigure = new ChangableViewNodeContainerRectangleFigureDesc();
+        shapeFigure = new ChangableViewNodeContainerRectangleFigureDesc((View) getAdapter(View.class));
         if (EditPartConfiguration.needsDoubleBorder(this)) {
     		CompoundBorder marginLineBorder = new CompoundBorder(new MarginBorder(3), new LineBorder(1));
     		CompoundBorder border = new CompoundBorder(new LineBorder(1), marginLineBorder);
@@ -59,7 +59,8 @@ public class TopLevelNodeListWithHeaderEditPart extends NodeListWithHeaderEditPa
 
 	class ChangableViewNodeContainerRectangleFigureDesc extends ViewNodeContainerRectangleFigureDesc {
 	    private SiriusWrapLabel labelFigure;
-		public ChangableViewNodeContainerRectangleFigureDesc() {
+		public ChangableViewNodeContainerRectangleFigureDesc(View view) {
+			super(view);
 			labelFigure = super.getLabelFigure();
 		}
 		@Override

plugins/org.etsi.mts.tdl.graphical.viewpoint/src/org/etsi/mts/tdl/graphical/sirius/part/Util.java

@@ -16,7 +16,7 @@ import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.gmf.runtime.notation.impl.NodeImpl;
 import org.eclipse.sirius.diagram.business.internal.metamodel.spec.DNodeListSpec;
 import org.eclipse.sirius.diagram.business.internal.metamodel.spec.DNodeSpec;
-import org.eclipse.sirius.diagram.ui.tools.api.figure.SiriusWrapLabel;
+import org.eclipse.sirius.ext.gmf.runtime.gef.ui.figures.SiriusWrapLabel;
 import org.eclipse.sirius.viewpoint.DMappingBased;
 
 public class Util {