This commit was manufactured by cvs2svn to create tag 'v20070404-1555'.
diff --git a/deprecated_plugins/org.eclipse.epf.diagramming/.classpath b/deprecated_plugins/org.eclipse.epf.diagramming/.classpath
deleted file mode 100644
index 751c8f2..0000000
--- a/deprecated_plugins/org.eclipse.epf.diagramming/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/deprecated_plugins/org.eclipse.epf.diagramming/.cvsignore b/deprecated_plugins/org.eclipse.epf.diagramming/.cvsignore
deleted file mode 100644
index ba077a4..0000000
--- a/deprecated_plugins/org.eclipse.epf.diagramming/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-bin
diff --git a/deprecated_plugins/org.eclipse.epf.diagramming/.options b/deprecated_plugins/org.eclipse.epf.diagramming/.options
deleted file mode 100644
index 09181ae..0000000
--- a/deprecated_plugins/org.eclipse.epf.diagramming/.options
+++ /dev/null
@@ -1,7 +0,0 @@
-# Debugging options for the org.eclipse.epf.diagramming plug-in

-

-# Turn on general debugging for the org.eclipse.epf.diagramming plug-in

-org.eclipse.epf.diagramming/debug=false

-

-# Turn on debugging of visualID processing

-org.eclipse.epf.diagramming/debug/visualID=true
\ No newline at end of file
diff --git a/deprecated_plugins/org.eclipse.epf.diagramming/.project b/deprecated_plugins/org.eclipse.epf.diagramming/.project
deleted file mode 100644
index 807a291..0000000
--- a/deprecated_plugins/org.eclipse.epf.diagramming/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<projectDescription>

-	<name>org.eclipse.epf.diagramming</name>

-	<comment></comment>

-	<projects>

-	</projects>

-	<buildSpec>

-		<buildCommand>

-			<name>org.eclipse.jdt.core.javabuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-		<buildCommand>

-			<name>org.eclipse.pde.ManifestBuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-		<buildCommand>

-			<name>org.eclipse.pde.SchemaBuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-	</buildSpec>

-	<natures>

-		<nature>org.eclipse.pde.PluginNature</nature>

-		<nature>org.eclipse.jdt.core.javanature</nature>

-	</natures>

-</projectDescription>

diff --git a/deprecated_plugins/org.eclipse.epf.diagramming/META-INF/MANIFEST.MF b/deprecated_plugins/org.eclipse.epf.diagramming/META-INF/MANIFEST.MF
deleted file mode 100644
index 89c61e0..0000000
--- a/deprecated_plugins/org.eclipse.epf.diagramming/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,49 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %pluginName
-Bundle-SymbolicName: org.eclipse.epf.diagramming; singleton:=true
-Bundle-Version: 1.2.0.qualifier
-Bundle-ClassPath: .
-Bundle-Activator: org.eclipse.epf.diagramming.part.EPFDiagramEditorPlugin
-Bundle-Vendor: %providerName
-Bundle-Localization: plugin
-Export-Package: org.eclipse.epf.diagramming.base.commands,
- org.eclipse.epf.diagramming.base.parts,
- org.eclipse.epf.diagramming.base.persistence,
- org.eclipse.epf.diagramming.base.util,
- org.eclipse.epf.diagramming.edit.parts,
- org.eclipse.epf.diagramming.part,
- org.eclipse.epf.diagramming.providers
-Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.core.resources,
- org.eclipse.jface,
- org.eclipse.ui.ide,
- org.eclipse.ui.views,
- org.eclipse.ui.workbench,
- org.eclipse.ui.workbench.texteditor,
- org.eclipse.emf.ecore,
- org.eclipse.emf.ecore.xmi,
- org.eclipse.emf.edit.ui,
- org.eclipse.gef;visibility:=reexport,
- org.eclipse.gmf.runtime.emf.core;visibility:=reexport,
- org.eclipse.gmf.runtime.emf.commands.core;visibility:=reexport,
- org.eclipse.gmf.runtime.emf.ui.properties;visibility:=reexport,
- org.eclipse.gmf.runtime.diagram.ui;visibility:=reexport,
- org.eclipse.gmf.runtime.diagram.ui.providers;visibility:=reexport,
- org.eclipse.gmf.runtime.diagram.ui.providers.ide;visibility:=reexport,
- org.eclipse.gmf.runtime.diagram.ui.render;visibility:=reexport,
- org.eclipse.gmf.runtime.diagram.ui.resources.editor;visibility:=reexport,
- org.eclipse.gmf.runtime.diagram.ui.resources.editor.ide;visibility:=reexport,
- org.eclipse.gmf.runtime.notation.providers;visibility:=reexport,
- org.eclipse.uml2.uml;visibility:=reexport,
- org.eclipse.uml2.uml.edit;visibility:=reexport,
- org.eclipse.emf.ecore;visibility:=reexport,
- org.eclipse.emf.ecore.edit;visibility:=reexport,
- org.eclipse.gmf.runtime.draw2d.ui;visibility:=reexport,
- org.eclipse.draw2d;visibility:=reexport,
- org.eclipse.epf.uma,
- org.eclipse.epf.library,
- org.eclipse.gmf.runtime.diagram.ui.geoshapes,
- org.eclipse.epf.diagram.core;visibility:=reexport,
- org.eclipse.gmf.runtime.diagram.ui.actions
-Eclipse-LazyStart: true
diff --git a/deprecated_plugins/org.eclipse.epf.diagramming/build.properties b/deprecated_plugins/org.eclipse.epf.diagramming/build.properties
deleted file mode 100644
index dd92db9..0000000
--- a/deprecated_plugins/org.eclipse.epf.diagramming/build.properties
+++ /dev/null
@@ -1,8 +0,0 @@
-bin.includes = .,\
-               icons/,\
-               META-INF/,\
-               plugin.xml,\
-               plugin.properties
-jars.compile.order = .
-source.. = src/
-output.. = bin/
\ No newline at end of file
diff --git a/deprecated_plugins/org.eclipse.epf.diagramming/icons/diagram/activity.gif b/deprecated_plugins/org.eclipse.epf.diagramming/icons/diagram/activity.gif
deleted file mode 100644
index 77393e6..0000000
--- a/deprecated_plugins/org.eclipse.epf.diagramming/icons/diagram/activity.gif
+++ /dev/null
Binary files differ
diff --git a/deprecated_plugins/org.eclipse.epf.diagramming/icons/diagram/iteration.gif b/deprecated_plugins/org.eclipse.epf.diagramming/icons/diagram/iteration.gif
deleted file mode 100644
index 25c8a14..0000000
--- a/deprecated_plugins/org.eclipse.epf.diagramming/icons/diagram/iteration.gif
+++ /dev/null
Binary files differ
diff --git a/deprecated_plugins/org.eclipse.epf.diagramming/icons/diagram/milestone.gif b/deprecated_plugins/org.eclipse.epf.diagramming/icons/diagram/milestone.gif
deleted file mode 100644
index 576ff94..0000000
--- a/deprecated_plugins/org.eclipse.epf.diagramming/icons/diagram/milestone.gif
+++ /dev/null
Binary files differ
diff --git a/deprecated_plugins/org.eclipse.epf.diagramming/icons/diagram/phase.gif b/deprecated_plugins/org.eclipse.epf.diagramming/icons/diagram/phase.gif
deleted file mode 100644
index 55cb3cd..0000000
--- a/deprecated_plugins/org.eclipse.epf.diagramming/icons/diagram/phase.gif
+++ /dev/null
Binary files differ
diff --git a/deprecated_plugins/org.eclipse.epf.diagramming/icons/diagram/taskdescriptor.gif b/deprecated_plugins/org.eclipse.epf.diagramming/icons/diagram/taskdescriptor.gif
deleted file mode 100644
index 345d651..0000000
--- a/deprecated_plugins/org.eclipse.epf.diagramming/icons/diagram/taskdescriptor.gif
+++ /dev/null
Binary files differ
diff --git a/deprecated_plugins/org.eclipse.epf.diagramming/icons/diagram/taskdescriptor1.gif b/deprecated_plugins/org.eclipse.epf.diagramming/icons/diagram/taskdescriptor1.gif
deleted file mode 100644
index 345d651..0000000
--- a/deprecated_plugins/org.eclipse.epf.diagramming/icons/diagram/taskdescriptor1.gif
+++ /dev/null
Binary files differ
diff --git a/deprecated_plugins/org.eclipse.epf.diagramming/icons/full/obj16/Activity.gif b/deprecated_plugins/org.eclipse.epf.diagramming/icons/full/obj16/Activity.gif
deleted file mode 100644
index cf20deb..0000000
--- a/deprecated_plugins/org.eclipse.epf.diagramming/icons/full/obj16/Activity.gif
+++ /dev/null
Binary files differ
diff --git a/deprecated_plugins/org.eclipse.epf.diagramming/icons/full/obj16/ActivityFinalNode.gif b/deprecated_plugins/org.eclipse.epf.diagramming/icons/full/obj16/ActivityFinalNode.gif
deleted file mode 100644
index ed49728..0000000
--- a/deprecated_plugins/org.eclipse.epf.diagramming/icons/full/obj16/ActivityFinalNode.gif
+++ /dev/null
Binary files differ
diff --git a/deprecated_plugins/org.eclipse.epf.diagramming/icons/full/obj16/ActivityPartition.gif b/deprecated_plugins/org.eclipse.epf.diagramming/icons/full/obj16/ActivityPartition.gif
deleted file mode 100644
index 341b09e..0000000
--- a/deprecated_plugins/org.eclipse.epf.diagramming/icons/full/obj16/ActivityPartition.gif
+++ /dev/null
Binary files differ
diff --git a/deprecated_plugins/org.eclipse.epf.diagramming/icons/full/obj16/ControlFlow.gif b/deprecated_plugins/org.eclipse.epf.diagramming/icons/full/obj16/ControlFlow.gif
deleted file mode 100644
index e30c223..0000000
--- a/deprecated_plugins/org.eclipse.epf.diagramming/icons/full/obj16/ControlFlow.gif
+++ /dev/null
Binary files differ
diff --git a/deprecated_plugins/org.eclipse.epf.diagramming/icons/full/obj16/DecisionNode.gif b/deprecated_plugins/org.eclipse.epf.diagramming/icons/full/obj16/DecisionNode.gif
deleted file mode 100644
index b4a601c..0000000
--- a/deprecated_plugins/org.eclipse.epf.diagramming/icons/full/obj16/DecisionNode.gif
+++ /dev/null
Binary files differ
diff --git a/deprecated_plugins/org.eclipse.epf.diagramming/icons/full/obj16/ForkNode.gif b/deprecated_plugins/org.eclipse.epf.diagramming/icons/full/obj16/ForkNode.gif
deleted file mode 100644
index 67c20b3..0000000
--- a/deprecated_plugins/org.eclipse.epf.diagramming/icons/full/obj16/ForkNode.gif
+++ /dev/null
Binary files differ
diff --git a/deprecated_plugins/org.eclipse.epf.diagramming/icons/full/obj16/InitialNode.gif b/deprecated_plugins/org.eclipse.epf.diagramming/icons/full/obj16/InitialNode.gif
deleted file mode 100644
index f75cf78..0000000
--- a/deprecated_plugins/org.eclipse.epf.diagramming/icons/full/obj16/InitialNode.gif
+++ /dev/null
Binary files differ
diff --git a/deprecated_plugins/org.eclipse.epf.diagramming/icons/full/obj16/Iteration.gif b/deprecated_plugins/org.eclipse.epf.diagramming/icons/full/obj16/Iteration.gif
deleted file mode 100644
index 4311e46..0000000
--- a/deprecated_plugins/org.eclipse.epf.diagramming/icons/full/obj16/Iteration.gif
+++ /dev/null
Binary files differ
diff --git a/deprecated_plugins/org.eclipse.epf.diagramming/icons/full/obj16/JoinNode.gif b/deprecated_plugins/org.eclipse.epf.diagramming/icons/full/obj16/JoinNode.gif
deleted file mode 100644
index f8c3a39..0000000
--- a/deprecated_plugins/org.eclipse.epf.diagramming/icons/full/obj16/JoinNode.gif
+++ /dev/null
Binary files differ
diff --git a/deprecated_plugins/org.eclipse.epf.diagramming/icons/full/obj16/MergeNode.gif b/deprecated_plugins/org.eclipse.epf.diagramming/icons/full/obj16/MergeNode.gif
deleted file mode 100644
index e74cb96..0000000
--- a/deprecated_plugins/org.eclipse.epf.diagramming/icons/full/obj16/MergeNode.gif
+++ /dev/null
Binary files differ
diff --git a/deprecated_plugins/org.eclipse.epf.diagramming/icons/full/obj16/Milestone.gif b/deprecated_plugins/org.eclipse.epf.diagramming/icons/full/obj16/Milestone.gif
deleted file mode 100644
index d9615eb..0000000
--- a/deprecated_plugins/org.eclipse.epf.diagramming/icons/full/obj16/Milestone.gif
+++ /dev/null
Binary files differ
diff --git a/deprecated_plugins/org.eclipse.epf.diagramming/icons/full/obj16/Phase.gif b/deprecated_plugins/org.eclipse.epf.diagramming/icons/full/obj16/Phase.gif
deleted file mode 100644
index ad60bd9..0000000
--- a/deprecated_plugins/org.eclipse.epf.diagramming/icons/full/obj16/Phase.gif
+++ /dev/null
Binary files differ
diff --git a/deprecated_plugins/org.eclipse.epf.diagramming/icons/full/obj16/StructuredActivityNode.gif b/deprecated_plugins/org.eclipse.epf.diagramming/icons/full/obj16/StructuredActivityNode.gif
deleted file mode 100644
index 260fb29..0000000
--- a/deprecated_plugins/org.eclipse.epf.diagramming/icons/full/obj16/StructuredActivityNode.gif
+++ /dev/null
Binary files differ
diff --git a/deprecated_plugins/org.eclipse.epf.diagramming/icons/full/obj16/TaskDescriptor.gif b/deprecated_plugins/org.eclipse.epf.diagramming/icons/full/obj16/TaskDescriptor.gif
deleted file mode 100644
index 554e26e..0000000
--- a/deprecated_plugins/org.eclipse.epf.diagramming/icons/full/obj16/TaskDescriptor.gif
+++ /dev/null
Binary files differ
diff --git a/deprecated_plugins/org.eclipse.epf.diagramming/icons/full/obj16/delete.gif b/deprecated_plugins/org.eclipse.epf.diagramming/icons/full/obj16/delete.gif
deleted file mode 100644
index b6922ac..0000000
--- a/deprecated_plugins/org.eclipse.epf.diagramming/icons/full/obj16/delete.gif
+++ /dev/null
Binary files differ
diff --git a/deprecated_plugins/org.eclipse.epf.diagramming/icons/obj16/UMLDiagramFile.gif b/deprecated_plugins/org.eclipse.epf.diagramming/icons/obj16/UMLDiagramFile.gif
deleted file mode 100644
index de93807..0000000
--- a/deprecated_plugins/org.eclipse.epf.diagramming/icons/obj16/UMLDiagramFile.gif
+++ /dev/null
Binary files differ
diff --git a/deprecated_plugins/org.eclipse.epf.diagramming/icons/wizban/NewUMLWizard.gif b/deprecated_plugins/org.eclipse.epf.diagramming/icons/wizban/NewUMLWizard.gif
deleted file mode 100644
index 83e03bf..0000000
--- a/deprecated_plugins/org.eclipse.epf.diagramming/icons/wizban/NewUMLWizard.gif
+++ /dev/null
Binary files differ
diff --git a/deprecated_plugins/org.eclipse.epf.diagramming/model/epfdiagram.gmfgen b/deprecated_plugins/org.eclipse.epf.diagramming/model/epfdiagram.gmfgen
deleted file mode 100644
index 2099226..0000000
--- a/deprecated_plugins/org.eclipse.epf.diagramming/model/epfdiagram.gmfgen
+++ /dev/null
@@ -1,917 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<gmfgen:GenEditorGenerator xmi:version="2.0"
-    xmlns:xmi="http://www.omg.org/XMI"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xmlns:gmfgen="http://www.eclipse.org/gmf/2005/GenModel" packageNamePrefix="org.eclipse.epf.diagramming"
-    modelID="AD"
-    sameFileForDiagramAndModel="true"
-    diagramFileExtension="xmi"
-    templateDirectory=""
-    copyrightText=" Copyright (c) 2005, 2006 IBM Corporation and others.&#xD;&#xA; All rights reserved. This program and the accompanying materials&#xD;&#xA; are made available under the terms of the Eclipse Public License v1.0&#xD;&#xA; which accompanies this distribution, and is available at&#xD;&#xA; http://www.eclipse.org/legal/epl-v10.html&#xD;&#xA;&#xD;&#xA; Contributors:&#xD;&#xA; IBM Corporation - initial implementation&#xD;&#xA;">
-  <diagram
-      visualID="79"
-      editPartClassName="ActivityEditPart"
-      itemSemanticEditPolicyClassName="ActivityItemSemanticEditPolicy"
-      notationViewFactoryClassName="ActivityViewFactory"
-      iconProviderPriority="Low"
-      canonicalEditPolicyClassName="ActivityCanonicalEditPolicy"
-      validationProviderClassName="ValidationProvider"
-      metricProviderClassName="MetricProvider"
-      validationDecoratorProviderClassName="ValidationDecoratorProvider">
-    <diagramRunTimeClass
-        href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Diagram"/>
-    <elementType
-        xsi:type="gmfgen:MetamodelType"
-        editHelperClassName="ActivityEditHelper"/>
-    <viewmap
-        xsi:type="gmfgen:FigureViewmap"
-        figureQualifiedClassName="org.eclipse.draw2d.FreeformLayer"/>
-    <domainDiagramElement
-        href="../../org.eclipse.uml2.uml/model/UML.genmodel#//uml/Activity"/>
-    <childNodes
-        visualID="2001"
-        editPartClassName="ActivityPartition2EditPart"
-        itemSemanticEditPolicyClassName="ActivityPartition2ItemSemanticEditPolicy"
-        notationViewFactoryClassName="ActivityPartition2ViewFactory"
-        canonicalEditPolicyClassName="ActivityPartition2CanonicalEditPolicy"
-        compartments="//@diagram/@compartments.1"
-        graphicalNodeEditPolicyClassName="ActivityPartition2GraphicalNodeEditPolicy"
-        containers="//@diagram/@compartments.1 //@diagram/@compartments.0">
-      <diagramRunTimeClass
-          href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
-      <elementType
-          xsi:type="gmfgen:SpecializationType"
-          metamodelType="//@diagram/@topLevelNodes.7/@elementType"
-          editHelperAdviceClassName="ActivityPartitionEditHelperAdvice"/>
-      <viewmap
-          xsi:type="gmfgen:InnerClassViewmap"
-          layoutType="XY_LAYOUT"
-          className="ActivityPartitionFigure"
-          classBody="&#xD;&#xA;&#xD;&#xA;/**&#xD;&#xA; * @generated&#xD;&#xA; */&#xD;&#xA;public class ActivityPartitionFigure extends org.eclipse.draw2d.RectangleFigure {&#xD;&#xA;&#xD;&#xA;&#x9;/**&#xD;&#xA;&#x9; * @generated&#xD;&#xA;&#x9; */&#xD;&#xA;&#x9;public ActivityPartitionFigure() {&#x9;&#xD;&#xA;&#x9;&#x9;&#xD;&#xA;&#x9;&#x9;org.eclipse.draw2d.XYLayout myGenLayoutManager = new org.eclipse.draw2d.XYLayout();&#xD;&#xA;&#x9;&#x9;&#x9;&#xD;&#xA;&#x9;&#x9;this.setLayoutManager(myGenLayoutManager);&#xD;&#xA;&#xD;&#xA;&#x9;&#x9;&#x9;&#x9;this.setForegroundColor(org.eclipse.draw2d.ColorConstants.black&#xD;&#xA;&#xD;&#xA;);&#xD;&#xA;&#x9;&#x9;this.setBackgroundColor(ACTIVITYPARTITIONFIGURE_BACK&#xD;&#xA;&#xD;&#xA;);&#xD;&#xA;&#x9;&#x9;this.setPreferredSize(getMapMode().DPtoLP(400), getMapMode().DPtoLP(800));&#xD;&#xA;&#x9;&#x9;this.setSize(getMapMode().DPtoLP(100), getMapMode().DPtoLP(200));&#xD;&#xA;&#x9;&#x9;this.setBorder(&#xD;&#xA;new org.eclipse.draw2d.LineBorder()&#xD;&#xA;);&#xD;&#xA;&#x9;&#x9;createContents();&#xD;&#xA;&#x9;}&#xD;&#xA;&#xD;&#xA;&#xD;&#xA;&#x9;/**&#xD;&#xA;&#x9; * @generated&#xD;&#xA;&#x9; */&#xD;&#xA;&#x9;private void createContents(){&#xD;&#xA;&#x9;&#x9;org.eclipse.gmf.runtime.draw2d.ui.figures.WrapLabel fig_0 = new org.eclipse.gmf.runtime.draw2d.ui.figures.WrapLabel();&#xD;&#xA;&#xD;&#xA;&#xD;&#xA;&#xD;&#xA;&#xD;&#xA;&#x9;&#x9;setFigurePartitionLabelFigure(fig_0);&#xD;&#xA;&#x9;&#x9;&#xD;&#xA;&#x9;&#x9;Object layData0 = null;&#xD;&#xA;&#xD;&#xA;&#x9;&#x9;this.add(fig_0, layData0);&#xD;&#xA;&#x9;}&#xD;&#xA;&#x9;&#xD;&#xA;&#x9;&#x9;&#xD;&#xA;&#x9;/**&#xD;&#xA;&#x9; * @generated&#xD;&#xA;&#x9; */&#xD;&#xA;&#x9;private org.eclipse.gmf.runtime.draw2d.ui.figures.WrapLabel fPartitionLabelFigure; &#xD;&#xA;&#xD;&#xA;&#x9;/**&#xD;&#xA;&#x9; * @generated&#xD;&#xA;&#x9; */&#xD;&#xA;&#x9;public org.eclipse.gmf.runtime.draw2d.ui.figures.WrapLabel getFigurePartitionLabelFigure() {&#xD;&#xA;&#x9;&#x9;return fPartitionLabelFigure;&#xD;&#xA;&#x9;}&#xD;&#xA;&#x9;&#xD;&#xA;&#x9;/**&#xD;&#xA;&#x9; * @generated&#xD;&#xA;&#x9; */&#xD;&#xA;&#x9;private void setFigurePartitionLabelFigure(org.eclipse.gmf.runtime.draw2d.ui.figures.WrapLabel fig){&#xD;&#xA;&#x9;&#x9;fPartitionLabelFigure = fig;&#xD;&#xA;&#x9;}&#xD;&#xA;&#xD;&#xA;&#xD;&#xA;&#xD;&#xA;&#xD;&#xA;&#x9;/**&#xD;&#xA;&#x9; * @generated&#xD;&#xA;&#x9; */&#xD;&#xA;&#x9;private boolean myUseLocalCoordinates = false;&#xD;&#xA;&#xD;&#xA;&#x9;/**&#xD;&#xA;&#x9; * @generated&#xD;&#xA;&#x9; */&#xD;&#xA;&#x9;protected boolean useLocalCoordinates() {&#xD;&#xA;&#x9;&#x9;return myUseLocalCoordinates;&#xD;&#xA;&#x9;}&#xD;&#xA;&#xD;&#xA;&#x9;/**&#xD;&#xA;&#x9; * @generated&#xD;&#xA;&#x9; */&#xD;&#xA;&#x9;protected void setUseLocalCoordinates(boolean useLocalCoordinates) {&#xD;&#xA;&#x9;&#x9;myUseLocalCoordinates = useLocalCoordinates;&#xD;&#xA;&#x9;}&#xD;&#xA;&#x9;&#xD;&#xA;&#xD;&#xA;}&#xD;&#xA;&#x9;&#xD;&#xA;&#x9;&#xD;&#xA;&#x9;/**&#xD;&#xA;&#x9; * @generated&#xD;&#xA;&#x9; */&#xD;&#xA;&#x9;public static final org.eclipse.swt.graphics.Color ACTIVITYPARTITIONFIGURE_BACK = new org.eclipse.swt.graphics.Color(null, 255, 255, 255);&#xD;&#xA;">
-        <attributes
-            xsi:type="gmfgen:StyleAttributes"
-            fixedForeground="true"
-            fixedBackground="true"/>
-        <requiredPluginIDs>org.eclipse.draw2d</requiredPluginIDs>
-        <requiredPluginIDs>org.eclipse.gmf.runtime.draw2d.ui</requiredPluginIDs>
-      </viewmap>
-      <modelFacet>
-        <metaClass
-            href="../../org.eclipse.uml2.uml/model/UML.genmodel#//uml/ActivityPartition"/>
-        <containmentMetaFeature
-            href="../../org.eclipse.uml2.uml/model/UML.genmodel#//uml/ActivityPartition/subpartition"/>
-        <childMetaFeature
-            href="../../org.eclipse.uml2.uml/model/UML.genmodel#//uml/ActivityPartition/subpartition"/>
-      </modelFacet>
-      <labels
-          visualID="4006"
-          editPartClassName="ActivityPartitionNameEditPart"
-          itemSemanticEditPolicyClassName="ActivityPartitionNameItemSemanticEditPolicy"
-          notationViewFactoryClassName="ActivityPartitionNameViewFactory"
-          elementIcon="true">
-        <diagramRunTimeClass
-            href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
-        <viewmap
-            xsi:type="gmfgen:ParentAssignedViewmap"
-            getterName="getFigurePartitionLabelFigure"
-            figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrapLabel"/>
-        <modelFacet
-            xsi:type="gmfgen:FeatureLabelModelFacet"
-            viewPattern=""
-            editPattern="">
-          <metaFeature
-              href="../../org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>
-        </modelFacet>
-      </labels>
-    </childNodes>
-    <topLevelNodes
-        visualID="1001"
-        editPartClassName="ActivityFinalNodeEditPart"
-        itemSemanticEditPolicyClassName="ActivityFinalNodeItemSemanticEditPolicy"
-        notationViewFactoryClassName="ActivityFinalNodeViewFactory"
-        canonicalEditPolicyClassName="ActivityFinalNodeCanonicalEditPolicy"
-        graphicalNodeEditPolicyClassName="ActivityFinalNodeGraphicalNodeEditPolicy">
-      <diagramRunTimeClass
-          href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
-      <elementType
-          xsi:type="gmfgen:MetamodelType"
-          editHelperClassName="ActivityFinalNodeEditHelper"/>
-      <viewmap
-          xsi:type="gmfgen:InnerClassViewmap"
-          className="EndNodeFigure"
-          classBody="&#xD;&#xA;&#xD;&#xA;/**&#xD;&#xA; * @generated&#xD;&#xA; */&#xD;&#xA;public class EndNodeFigure extends org.eclipse.epf.gmf.uml.model.EndNodeFigure {&#xD;&#xA;&#xD;&#xA;&#x9;/**&#xD;&#xA;&#x9; * @generated&#xD;&#xA;&#x9; */&#xD;&#xA;&#x9;public EndNodeFigure() {&#x9;&#xD;&#xA;&#x9;&#x9;&#xD;&#xA;&#xD;&#xA;&#x9;&#x9;&#xD;&#xA;&#xD;&#xA;&#xD;&#xA;&#x9;&#x9;this.setForegroundColor(org.eclipse.draw2d.ColorConstants.darkBlue&#xD;&#xA;&#xD;&#xA;);&#xD;&#xA;&#x9;&#x9;this.setBackgroundColor(ENDNODEFIGURE_BACK&#xD;&#xA;&#xD;&#xA;);&#xD;&#xA;&#x9;&#x9;this.setPreferredSize(getMapMode().DPtoLP(24), getMapMode().DPtoLP(24));&#xD;&#xA;&#x9;&#x9;this.setSize(getMapMode().DPtoLP(24), getMapMode().DPtoLP(24));&#xD;&#xA;&#xD;&#xA;&#x9;&#x9;createContents();&#xD;&#xA;&#x9;}&#xD;&#xA;&#xD;&#xA;&#xD;&#xA;&#x9;/**&#xD;&#xA;&#x9; * @generated&#xD;&#xA;&#x9; */&#xD;&#xA;&#x9;private void createContents(){&#xD;&#xA;&#x9;}&#xD;&#xA;&#x9;&#xD;&#xA;&#xD;&#xA;&#xD;&#xA;&#xD;&#xA;&#x9;/**&#xD;&#xA;&#x9; * @generated&#xD;&#xA;&#x9; */&#xD;&#xA;&#x9;private boolean myUseLocalCoordinates = false;&#xD;&#xA;&#xD;&#xA;&#x9;/**&#xD;&#xA;&#x9; * @generated&#xD;&#xA;&#x9; */&#xD;&#xA;&#x9;protected boolean useLocalCoordinates() {&#xD;&#xA;&#x9;&#x9;return myUseLocalCoordinates;&#xD;&#xA;&#x9;}&#xD;&#xA;&#xD;&#xA;&#x9;/**&#xD;&#xA;&#x9; * @generated&#xD;&#xA;&#x9; */&#xD;&#xA;&#x9;protected void setUseLocalCoordinates(boolean useLocalCoordinates) {&#xD;&#xA;&#x9;&#x9;myUseLocalCoordinates = useLocalCoordinates;&#xD;&#xA;&#x9;}&#xD;&#xA;&#x9;&#xD;&#xA;&#xD;&#xA;}&#xD;&#xA;&#x9;&#xD;&#xA;&#x9;&#xD;&#xA;&#x9;/**&#xD;&#xA;&#x9; * @generated&#xD;&#xA;&#x9; */&#xD;&#xA;&#x9;public static final org.eclipse.swt.graphics.Color ENDNODEFIGURE_BACK = new org.eclipse.swt.graphics.Color(null, 45, 85, 130);&#xD;&#xA;">
-        <attributes
-            xsi:type="gmfgen:StyleAttributes"
-            fixedForeground="true"
-            fixedBackground="true"/>
-        <requiredPluginIDs>org.eclipse.draw2d</requiredPluginIDs>
-        <requiredPluginIDs>org.eclipse.gmf.runtime.draw2d.ui</requiredPluginIDs>
-      </viewmap>
-      <modelFacet>
-        <metaClass
-            href="../../org.eclipse.uml2.uml/model/UML.genmodel#//uml/ActivityFinalNode"/>
-        <containmentMetaFeature
-            href="../../org.eclipse.uml2.uml/model/UML.genmodel#//uml/Activity/node"/>
-        <childMetaFeature
-            href="../../org.eclipse.uml2.uml/model/UML.genmodel#//uml/Activity/node"/>
-      </modelFacet>
-      <labels
-          xsi:type="gmfgen:GenExternalNodeLabel"
-          visualID="4001"
-          editPartClassName="ActivityFinalNodeNameEditPart"
-          itemSemanticEditPolicyClassName="ActivityFinalNodeNameItemSemanticEditPolicy"
-          notationViewFactoryClassName="ActivityFinalNodeNameViewFactory">
-        <diagramRunTimeClass
-            href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
-        <viewmap
-            xsi:type="gmfgen:FigureViewmap"
-            figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrapLabel">
-          <requiredPluginIDs>org.eclipse.draw2d</requiredPluginIDs>
-          <requiredPluginIDs>org.eclipse.gmf.runtime.draw2d.ui</requiredPluginIDs>
-        </viewmap>
-        <modelFacet
-            xsi:type="gmfgen:FeatureLabelModelFacet"
-            viewPattern=""
-            editPattern="">
-          <metaFeature
-              href="../../org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>
-        </modelFacet>
-      </labels>
-    </topLevelNodes>
-    <topLevelNodes
-        visualID="1002"
-        editPartClassName="MergeNodeEditPart"
-        itemSemanticEditPolicyClassName="MergeNodeItemSemanticEditPolicy"
-        notationViewFactoryClassName="MergeNodeViewFactory"
-        canonicalEditPolicyClassName="MergeNodeCanonicalEditPolicy"
-        graphicalNodeEditPolicyClassName="MergeNodeGraphicalNodeEditPolicy">
-      <diagramRunTimeClass
-          href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
-      <elementType
-          xsi:type="gmfgen:MetamodelType"
-          editHelperClassName="MergeNodeEditHelper"/>
-      <viewmap
-          xsi:type="gmfgen:InnerClassViewmap"
-          className="DecisionDiamondFigure"
-          classBody="&#xD;&#xA;&#xD;&#xA;/**&#xD;&#xA; * @generated&#xD;&#xA; */&#xD;&#xA;public class DecisionDiamondFigure extends org.eclipse.gmf.runtime.diagram.ui.geoshapes.internal.draw2d.figures.GeoShapeDiamondFigure {&#xD;&#xA;&#xD;&#xA;&#x9;/**&#xD;&#xA;&#x9; * @generated&#xD;&#xA;&#x9; */&#xD;&#xA;&#x9;public DecisionDiamondFigure() {&#x9;&#xD;&#xA;&#x9;&#x9;&#xD;&#xA;&#xD;&#xA;&#x9;&#x9;&#xD;&#xA;&#xD;&#xA;&#xD;&#xA;&#x9;&#x9;this.setForegroundColor(org.eclipse.draw2d.ColorConstants.darkBlue&#xD;&#xA;&#xD;&#xA;);&#xD;&#xA;&#x9;&#x9;this.setBackgroundColor(DECISIONDIAMONDFIGURE_BACK&#xD;&#xA;&#xD;&#xA;);&#xD;&#xA;&#x9;&#x9;this.setPreferredSize(getMapMode().DPtoLP(50), getMapMode().DPtoLP(50));&#xD;&#xA;&#x9;&#x9;this.setSize(getMapMode().DPtoLP(50), getMapMode().DPtoLP(50));&#xD;&#xA;&#xD;&#xA;&#x9;&#x9;createContents();&#xD;&#xA;&#x9;}&#xD;&#xA;&#xD;&#xA;&#xD;&#xA;&#x9;/**&#xD;&#xA;&#x9; * @generated&#xD;&#xA;&#x9; */&#xD;&#xA;&#x9;private void createContents(){&#xD;&#xA;&#x9;&#x9;org.eclipse.gmf.runtime.draw2d.ui.figures.WrapLabel fig_0 = new org.eclipse.gmf.runtime.draw2d.ui.figures.WrapLabel();&#xD;&#xA;&#xD;&#xA;&#xD;&#xA;&#xD;&#xA;&#xD;&#xA;&#x9;&#x9;setFigureDiamondLabel(fig_0);&#xD;&#xA;&#x9;&#x9;&#xD;&#xA;&#x9;&#x9;Object layData0 = null;&#xD;&#xA;&#xD;&#xA;&#x9;&#x9;this.add(fig_0, layData0);&#xD;&#xA;&#x9;}&#xD;&#xA;&#x9;&#xD;&#xA;&#x9;&#x9;&#xD;&#xA;&#x9;/**&#xD;&#xA;&#x9; * @generated&#xD;&#xA;&#x9; */&#xD;&#xA;&#x9;private org.eclipse.gmf.runtime.draw2d.ui.figures.WrapLabel fDiamondLabel; &#xD;&#xA;&#xD;&#xA;&#x9;/**&#xD;&#xA;&#x9; * @generated&#xD;&#xA;&#x9; */&#xD;&#xA;&#x9;public org.eclipse.gmf.runtime.draw2d.ui.figures.WrapLabel getFigureDiamondLabel() {&#xD;&#xA;&#x9;&#x9;return fDiamondLabel;&#xD;&#xA;&#x9;}&#xD;&#xA;&#x9;&#xD;&#xA;&#x9;/**&#xD;&#xA;&#x9; * @generated&#xD;&#xA;&#x9; */&#xD;&#xA;&#x9;private void setFigureDiamondLabel(org.eclipse.gmf.runtime.draw2d.ui.figures.WrapLabel fig){&#xD;&#xA;&#x9;&#x9;fDiamondLabel = fig;&#xD;&#xA;&#x9;}&#xD;&#xA;&#xD;&#xA;&#xD;&#xA;&#xD;&#xA;&#xD;&#xA;&#x9;/**&#xD;&#xA;&#x9; * @generated&#xD;&#xA;&#x9; */&#xD;&#xA;&#x9;private boolean myUseLocalCoordinates = false;&#xD;&#xA;&#xD;&#xA;&#x9;/**&#xD;&#xA;&#x9; * @generated&#xD;&#xA;&#x9; */&#xD;&#xA;&#x9;protected boolean useLocalCoordinates() {&#xD;&#xA;&#x9;&#x9;return myUseLocalCoordinates;&#xD;&#xA;&#x9;}&#xD;&#xA;&#xD;&#xA;&#x9;/**&#xD;&#xA;&#x9; * @generated&#xD;&#xA;&#x9; */&#xD;&#xA;&#x9;protected void setUseLocalCoordinates(boolean useLocalCoordinates) {&#xD;&#xA;&#x9;&#x9;myUseLocalCoordinates = useLocalCoordinates;&#xD;&#xA;&#x9;}&#xD;&#xA;&#x9;&#xD;&#xA;&#xD;&#xA;}&#xD;&#xA;&#x9;&#xD;&#xA;&#x9;&#xD;&#xA;&#x9;/**&#xD;&#xA;&#x9; * @generated&#xD;&#xA;&#x9; */&#xD;&#xA;&#x9;public static final org.eclipse.swt.graphics.Color DECISIONDIAMONDFIGURE_BACK = new org.eclipse.swt.graphics.Color(null, 185, 205, 230);&#xD;&#xA;">
-        <attributes
-            xsi:type="gmfgen:StyleAttributes"
-            fixedForeground="true"
-            fixedBackground="true"/>
-        <requiredPluginIDs>org.eclipse.draw2d</requiredPluginIDs>
-        <requiredPluginIDs>org.eclipse.gmf.runtime.draw2d.ui</requiredPluginIDs>
-      </viewmap>
-      <modelFacet>
-        <metaClass
-            href="../../org.eclipse.uml2.uml/model/UML.genmodel#//uml/MergeNode"/>
-        <containmentMetaFeature
-            href="../../org.eclipse.uml2.uml/model/UML.genmodel#//uml/Activity/node"/>
-        <childMetaFeature
-            href="../../org.eclipse.uml2.uml/model/UML.genmodel#//uml/Activity/node"/>
-      </modelFacet>
-      <labels
-          visualID="4002"
-          editPartClassName="MergeNodeNameEditPart"
-          itemSemanticEditPolicyClassName="MergeNodeNameItemSemanticEditPolicy"
-          notationViewFactoryClassName="MergeNodeNameViewFactory">
-        <diagramRunTimeClass
-            href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
-        <viewmap
-            xsi:type="gmfgen:InnerClassViewmap"
-            className="NodeNameFigure"
-            classBody="&#xD;&#xA;&#xD;&#xA;/**&#xD;&#xA; * @generated&#xD;&#xA; */&#xD;&#xA;public class NodeNameFigure extends org.eclipse.gmf.runtime.draw2d.ui.figures.WrapLabel {&#xD;&#xA;&#xD;&#xA;&#x9;/**&#xD;&#xA;&#x9; * @generated&#xD;&#xA;&#x9; */&#xD;&#xA;&#x9;public NodeNameFigure() {&#x9;&#xD;&#xA;&#x9;&#x9;&#xD;&#xA;&#xD;&#xA;&#x9;&#x9;this.setText(&quot;&lt;...>&quot;);&#xD;&#xA;&#x9;&#x9;createContents();&#xD;&#xA;&#x9;}&#xD;&#xA;&#xD;&#xA;&#xD;&#xA;&#x9;/**&#xD;&#xA;&#x9; * @generated&#xD;&#xA;&#x9; */&#xD;&#xA;&#x9;private void createContents(){&#xD;&#xA;&#x9;}&#xD;&#xA;&#x9;&#xD;&#xA;&#xD;&#xA;&#xD;&#xA;&#xD;&#xA;&#x9;/**&#xD;&#xA;&#x9; * @generated&#xD;&#xA;&#x9; */&#xD;&#xA;&#x9;private boolean myUseLocalCoordinates = false;&#xD;&#xA;&#xD;&#xA;&#x9;/**&#xD;&#xA;&#x9; * @generated&#xD;&#xA;&#x9; */&#xD;&#xA;&#x9;protected boolean useLocalCoordinates() {&#xD;&#xA;&#x9;&#x9;return myUseLocalCoordinates;&#xD;&#xA;&#x9;}&#xD;&#xA;&#xD;&#xA;&#x9;/**&#xD;&#xA;&#x9; * @generated&#xD;&#xA;&#x9; */&#xD;&#xA;&#x9;protected void setUseLocalCoordinates(boolean useLocalCoordinates) {&#xD;&#xA;&#x9;&#x9;myUseLocalCoordinates = useLocalCoordinates;&#xD;&#xA;&#x9;}&#xD;&#xA;&#x9;&#xD;&#xA;&#xD;&#xA;}&#xD;&#xA;&#x9;&#xD;&#xA;">
-          <requiredPluginIDs>org.eclipse.draw2d</requiredPluginIDs>
-          <requiredPluginIDs>org.eclipse.gmf.runtime.draw2d.ui</requiredPluginIDs>
-        </viewmap>
-        <modelFacet
-            xsi:type="gmfgen:FeatureLabelModelFacet"
-            viewPattern="">
-          <metaFeature
-              href="../../org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>
-        </modelFacet>
-      </labels>
-    </topLevelNodes>
-    <topLevelNodes
-        visualID="1003"
-        editPartClassName="ForkNodeEditPart"
-        itemSemanticEditPolicyClassName="ForkNodeItemSemanticEditPolicy"
-        notationViewFactoryClassName="ForkNodeViewFactory"
-        canonicalEditPolicyClassName="ForkNodeCanonicalEditPolicy"
-        graphicalNodeEditPolicyClassName="ForkNodeGraphicalNodeEditPolicy">
-      <diagramRunTimeClass
-          href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
-      <elementType
-          xsi:type="gmfgen:MetamodelType"
-          editHelperClassName="ForkNodeEditHelper"/>
-      <viewmap
-          xsi:type="gmfgen:InnerClassViewmap"
-          className="ForkNodeFigure"
-          classBody="&#xD;&#xA;&#xD;&#xA;/**&#xD;&#xA; * @generated&#xD;&#xA; */&#xD;&#xA;public class ForkNodeFigure extends org.eclipse.draw2d.RectangleFigure {&#xD;&#xA;&#xD;&#xA;&#x9;/**&#xD;&#xA;&#x9; * @generated&#xD;&#xA;&#x9; */&#xD;&#xA;&#x9;public ForkNodeFigure() {&#x9;&#xD;&#xA;&#x9;&#x9;&#xD;&#xA;&#xD;&#xA;&#x9;&#x9;&#xD;&#xA;&#x9;&#x9;this.setBackgroundColor(FORKNODEFIGURE_BACK&#xD;&#xA;&#xD;&#xA;);&#xD;&#xA;&#x9;&#x9;this.setPreferredSize(getMapMode().DPtoLP(100), getMapMode().DPtoLP(8));&#xD;&#xA;&#x9;&#x9;this.setSize(getMapMode().DPtoLP(100), getMapMode().DPtoLP(8));&#xD;&#xA;&#x9;&#x9;createContents();&#xD;&#xA;&#x9;}&#xD;&#xA;&#xD;&#xA;&#xD;&#xA;&#x9;/**&#xD;&#xA;&#x9; * @generated&#xD;&#xA;&#x9; */&#xD;&#xA;&#x9;private void createContents(){&#xD;&#xA;&#x9;}&#xD;&#xA;&#x9;&#xD;&#xA;&#xD;&#xA;&#xD;&#xA;&#xD;&#xA;&#x9;/**&#xD;&#xA;&#x9; * @generated&#xD;&#xA;&#x9; */&#xD;&#xA;&#x9;private boolean myUseLocalCoordinates = false;&#xD;&#xA;&#xD;&#xA;&#x9;/**&#xD;&#xA;&#x9; * @generated&#xD;&#xA;&#x9; */&#xD;&#xA;&#x9;protected boolean useLocalCoordinates() {&#xD;&#xA;&#x9;&#x9;return myUseLocalCoordinates;&#xD;&#xA;&#x9;}&#xD;&#xA;&#xD;&#xA;&#x9;/**&#xD;&#xA;&#x9; * @generated&#xD;&#xA;&#x9; */&#xD;&#xA;&#x9;protected void setUseLocalCoordinates(boolean useLocalCoordinates) {&#xD;&#xA;&#x9;&#x9;myUseLocalCoordinates = useLocalCoordinates;&#xD;&#xA;&#x9;}&#xD;&#xA;&#x9;&#xD;&#xA;&#xD;&#xA;}&#xD;&#xA;&#x9;&#xD;&#xA;&#x9;&#xD;&#xA;&#x9;/**&#xD;&#xA;&#x9; * @generated&#xD;&#xA;&#x9; */&#xD;&#xA;&#x9;public static final org.eclipse.swt.graphics.Color FORKNODEFIGURE_BACK = new org.eclipse.swt.graphics.Color(null, 51, 102, 102);&#xD;&#xA;">
-        <attributes
-            xsi:type="gmfgen:StyleAttributes"
-            fixedBackground="true"/>
-        <attributes
-            xsi:type="gmfgen:ResizeConstraints"
-            resizeHandles="24"/>
-        <requiredPluginIDs>org.eclipse.draw2d</requiredPluginIDs>
-        <requiredPluginIDs>org.eclipse.gmf.runtime.draw2d.ui</requiredPluginIDs>
-      </viewmap>
-      <modelFacet>
-        <metaClass
-            href="../../org.eclipse.uml2.uml/model/UML.genmodel#//uml/ForkNode"/>
-        <containmentMetaFeature
-            href="../../org.eclipse.uml2.uml/model/UML.genmodel#//uml/Activity/node"/>
-        <childMetaFeature
-            href="../../org.eclipse.uml2.uml/model/UML.genmodel#//uml/Activity/node"/>
-      </modelFacet>
-    </topLevelNodes>
-    <topLevelNodes
-        visualID="1004"
-        editPartClassName="InitialNodeEditPart"
-        itemSemanticEditPolicyClassName="InitialNodeItemSemanticEditPolicy"
-        notationViewFactoryClassName="InitialNodeViewFactory"
-        canonicalEditPolicyClassName="InitialNodeCanonicalEditPolicy"
-        graphicalNodeEditPolicyClassName="InitialNodeGraphicalNodeEditPolicy">
-      <diagramRunTimeClass
-          href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
-      <elementType
-          xsi:type="gmfgen:MetamodelType"
-          editHelperClassName="InitialNodeEditHelper"/>
-      <viewmap
-          xsi:type="gmfgen:InnerClassViewmap"
-          className="InitialNodeFigure"
-          classBody="&#xD;&#xA;&#xD;&#xA;/**&#xD;&#xA; * @generated&#xD;&#xA; */&#xD;&#xA;public class InitialNodeFigure extends org.eclipse.draw2d.Ellipse {&#xD;&#xA;&#xD;&#xA;&#x9;/**&#xD;&#xA;&#x9; * @generated&#xD;&#xA;&#x9; */&#xD;&#xA;&#x9;public InitialNodeFigure() {&#x9;&#xD;&#xA;&#x9;&#x9;&#xD;&#xA;&#xD;&#xA;&#x9;&#x9;&#x9;&#x9;this.setForegroundColor(org.eclipse.draw2d.ColorConstants.darkBlue&#xD;&#xA;&#xD;&#xA;);&#xD;&#xA;&#x9;&#x9;this.setBackgroundColor(INITIALNODEFIGURE_BACK&#xD;&#xA;&#xD;&#xA;);&#xD;&#xA;&#x9;&#x9;this.setPreferredSize(getMapMode().DPtoLP(20), getMapMode().DPtoLP(20));&#xD;&#xA;&#x9;&#x9;this.setSize(getMapMode().DPtoLP(20), getMapMode().DPtoLP(20));&#xD;&#xA;&#x9;&#x9;createContents();&#xD;&#xA;&#x9;}&#xD;&#xA;&#xD;&#xA;&#xD;&#xA;&#x9;/**&#xD;&#xA;&#x9; * @generated&#xD;&#xA;&#x9; */&#xD;&#xA;&#x9;private void createContents(){&#xD;&#xA;&#x9;}&#xD;&#xA;&#x9;&#xD;&#xA;&#xD;&#xA;&#xD;&#xA;&#xD;&#xA;&#x9;/**&#xD;&#xA;&#x9; * @generated&#xD;&#xA;&#x9; */&#xD;&#xA;&#x9;private boolean myUseLocalCoordinates = false;&#xD;&#xA;&#xD;&#xA;&#x9;/**&#xD;&#xA;&#x9; * @generated&#xD;&#xA;&#x9; */&#xD;&#xA;&#x9;protected boolean useLocalCoordinates() {&#xD;&#xA;&#x9;&#x9;return myUseLocalCoordinates;&#xD;&#xA;&#x9;}&#xD;&#xA;&#xD;&#xA;&#x9;/**&#xD;&#xA;&#x9; * @generated&#xD;&#xA;&#x9; */&#xD;&#xA;&#x9;protected void setUseLocalCoordinates(boolean useLocalCoordinates) {&#xD;&#xA;&#x9;&#x9;myUseLocalCoordinates = useLocalCoordinates;&#xD;&#xA;&#x9;}&#xD;&#xA;&#x9;&#xD;&#xA;&#xD;&#xA;}&#xD;&#xA;&#x9;&#xD;&#xA;&#x9;&#xD;&#xA;&#x9;/**&#xD;&#xA;&#x9; * @generated&#xD;&#xA;&#x9; */&#xD;&#xA;&#x9;public static final org.eclipse.swt.graphics.Color INITIALNODEFIGURE_BACK = new org.eclipse.swt.graphics.Color(null, 45, 85, 130);&#xD;&#xA;">
-        <attributes
-            xsi:type="gmfgen:StyleAttributes"
-            fixedForeground="true"
-            fixedBackground="true"/>
-        <requiredPluginIDs>org.eclipse.draw2d</requiredPluginIDs>
-        <requiredPluginIDs>org.eclipse.gmf.runtime.draw2d.ui</requiredPluginIDs>
-      </viewmap>
-      <modelFacet>
-        <metaClass
-            href="../../org.eclipse.uml2.uml/model/UML.genmodel#//uml/InitialNode"/>
-        <containmentMetaFeature
-            href="../../org.eclipse.uml2.uml/model/UML.genmodel#//uml/Activity/node"/>
-        <childMetaFeature
-            href="../../org.eclipse.uml2.uml/model/UML.genmodel#//uml/Activity/node"/>
-      </modelFacet>
-      <labels
-          xsi:type="gmfgen:GenExternalNodeLabel"
-          visualID="4003"
-          editPartClassName="InitialNodeNameEditPart"
-          itemSemanticEditPolicyClassName="InitialNodeNameItemSemanticEditPolicy"
-          notationViewFactoryClassName="InitialNodeNameViewFactory">
-        <diagramRunTimeClass
-            href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
-        <viewmap
-            xsi:type="gmfgen:FigureViewmap"
-            figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrapLabel">
-          <requiredPluginIDs>org.eclipse.draw2d</requiredPluginIDs>
-          <requiredPluginIDs>org.eclipse.gmf.runtime.draw2d.ui</requiredPluginIDs>
-        </viewmap>
-        <modelFacet
-            xsi:type="gmfgen:FeatureLabelModelFacet"
-            viewPattern=""
-            editPattern="">
-          <metaFeature
-              href="../../org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>
-        </modelFacet>
-      </labels>
-    </topLevelNodes>
-    <topLevelNodes
-        visualID="1005"
-        editPartClassName="DecisionNodeEditPart"
-        itemSemanticEditPolicyClassName="DecisionNodeItemSemanticEditPolicy"
-        notationViewFactoryClassName="DecisionNodeViewFactory"
-        canonicalEditPolicyClassName="DecisionNodeCanonicalEditPolicy"
-        graphicalNodeEditPolicyClassName="DecisionNodeGraphicalNodeEditPolicy">
-      <diagramRunTimeClass
-          href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
-      <elementType
-          xsi:type="gmfgen:MetamodelType"
-          editHelperClassName="DecisionNodeEditHelper"/>
-      <viewmap
-          xsi:type="gmfgen:InnerClassViewmap"
-          className="DecisionDiamondFigure"
-          classBody="&#xD;&#xA;&#xD;&#xA;/**&#xD;&#xA; * @generated&#xD;&#xA; */&#xD;&#xA;public class DecisionDiamondFigure extends org.eclipse.gmf.runtime.diagram.ui.geoshapes.internal.draw2d.figures.GeoShapeDiamondFigure {&#xD;&#xA;&#xD;&#xA;&#x9;/**&#xD;&#xA;&#x9; * @generated&#xD;&#xA;&#x9; */&#xD;&#xA;&#x9;public DecisionDiamondFigure() {&#x9;&#xD;&#xA;&#x9;&#x9;&#xD;&#xA;&#xD;&#xA;&#x9;&#x9;&#xD;&#xA;&#xD;&#xA;&#xD;&#xA;&#x9;&#x9;this.setForegroundColor(org.eclipse.draw2d.ColorConstants.darkBlue&#xD;&#xA;&#xD;&#xA;);&#xD;&#xA;&#x9;&#x9;this.setBackgroundColor(DECISIONDIAMONDFIGURE_BACK&#xD;&#xA;&#xD;&#xA;);&#xD;&#xA;&#x9;&#x9;this.setPreferredSize(getMapMode().DPtoLP(50), getMapMode().DPtoLP(50));&#xD;&#xA;&#x9;&#x9;this.setSize(getMapMode().DPtoLP(50), getMapMode().DPtoLP(50));&#xD;&#xA;&#xD;&#xA;&#x9;&#x9;createContents();&#xD;&#xA;&#x9;}&#xD;&#xA;&#xD;&#xA;&#xD;&#xA;&#x9;/**&#xD;&#xA;&#x9; * @generated&#xD;&#xA;&#x9; */&#xD;&#xA;&#x9;private void createContents(){&#xD;&#xA;&#x9;&#x9;org.eclipse.gmf.runtime.draw2d.ui.figures.WrapLabel fig_0 = new org.eclipse.gmf.runtime.draw2d.ui.figures.WrapLabel();&#xD;&#xA;&#xD;&#xA;&#xD;&#xA;&#xD;&#xA;&#xD;&#xA;&#x9;&#x9;setFigureDiamondLabel(fig_0);&#xD;&#xA;&#x9;&#x9;&#xD;&#xA;&#x9;&#x9;Object layData0 = null;&#xD;&#xA;&#xD;&#xA;&#x9;&#x9;this.add(fig_0, layData0);&#xD;&#xA;&#x9;}&#xD;&#xA;&#x9;&#xD;&#xA;&#x9;&#x9;&#xD;&#xA;&#x9;/**&#xD;&#xA;&#x9; * @generated&#xD;&#xA;&#x9; */&#xD;&#xA;&#x9;private org.eclipse.gmf.runtime.draw2d.ui.figures.WrapLabel fDiamondLabel; &#xD;&#xA;&#xD;&#xA;&#x9;/**&#xD;&#xA;&#x9; * @generated&#xD;&#xA;&#x9; */&#xD;&#xA;&#x9;public org.eclipse.gmf.runtime.draw2d.ui.figures.WrapLabel getFigureDiamondLabel() {&#xD;&#xA;&#x9;&#x9;return fDiamondLabel;&#xD;&#xA;&#x9;}&#xD;&#xA;&#x9;&#xD;&#xA;&#x9;/**&#xD;&#xA;&#x9; * @generated&#xD;&#xA;&#x9; */&#xD;&#xA;&#x9;private void setFigureDiamondLabel(org.eclipse.gmf.runtime.draw2d.ui.figures.WrapLabel fig){&#xD;&#xA;&#x9;&#x9;fDiamondLabel = fig;&#xD;&#xA;&#x9;}&#xD;&#xA;&#xD;&#xA;&#xD;&#xA;&#xD;&#xA;&#xD;&#xA;&#x9;/**&#xD;&#xA;&#x9; * @generated&#xD;&#xA;&#x9; */&#xD;&#xA;&#x9;private boolean myUseLocalCoordinates = false;&#xD;&#xA;&#xD;&#xA;&#x9;/**&#xD;&#xA;&#x9; * @generated&#xD;&#xA;&#x9; */&#xD;&#xA;&#x9;protected boolean useLocalCoordinates() {&#xD;&#xA;&#x9;&#x9;return myUseLocalCoordinates;&#xD;&#xA;&#x9;}&#xD;&#xA;&#xD;&#xA;&#x9;/**&#xD;&#xA;&#x9; * @generated&#xD;&#xA;&#x9; */&#xD;&#xA;&#x9;protected void setUseLocalCoordinates(boolean useLocalCoordinates) {&#xD;&#xA;&#x9;&#x9;myUseLocalCoordinates = useLocalCoordinates;&#xD;&#xA;&#x9;}&#xD;&#xA;&#x9;&#xD;&#xA;&#xD;&#xA;}&#xD;&#xA;&#x9;&#xD;&#xA;&#x9;&#xD;&#xA;&#x9;/**&#xD;&#xA;&#x9; * @generated&#xD;&#xA;&#x9; */&#xD;&#xA;&#x9;public static final org.eclipse.swt.graphics.Color DECISIONDIAMONDFIGURE_BACK = new org.eclipse.swt.graphics.Color(null, 185, 205, 230);&#xD;&#xA;">
-        <attributes
-            xsi:type="gmfgen:StyleAttributes"
-            fixedForeground="true"
-            fixedBackground="true"/>
-        <requiredPluginIDs>org.eclipse.draw2d</requiredPluginIDs>
-        <requiredPluginIDs>org.eclipse.gmf.runtime.draw2d.ui</requiredPluginIDs>
-      </viewmap>
-      <modelFacet>
-        <metaClass
-            href="../../org.eclipse.uml2.uml/model/UML.genmodel#//uml/DecisionNode"/>
-        <containmentMetaFeature
-            href="../../org.eclipse.uml2.uml/model/UML.genmodel#//uml/Activity/node"/>
-        <childMetaFeature
-            href="../../org.eclipse.uml2.uml/model/UML.genmodel#//uml/Activity/node"/>
-      </modelFacet>
-      <labels
-          visualID="4004"
-          editPartClassName="DecisionNodeNameEditPart"
-          itemSemanticEditPolicyClassName="DecisionNodeNameItemSemanticEditPolicy"
-          notationViewFactoryClassName="DecisionNodeNameViewFactory">
-        <diagramRunTimeClass
-            href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
-        <viewmap
-            xsi:type="gmfgen:InnerClassViewmap"
-            className="NodeNameFigure"
-            classBody="&#xD;&#xA;&#xD;&#xA;/**&#xD;&#xA; * @generated&#xD;&#xA; */&#xD;&#xA;public class NodeNameFigure extends org.eclipse.gmf.runtime.draw2d.ui.figures.WrapLabel {&#xD;&#xA;&#xD;&#xA;&#x9;/**&#xD;&#xA;&#x9; * @generated&#xD;&#xA;&#x9; */&#xD;&#xA;&#x9;public NodeNameFigure() {&#x9;&#xD;&#xA;&#x9;&#x9;&#xD;&#xA;&#xD;&#xA;&#x9;&#x9;this.setText(&quot;&lt;...>&quot;);&#xD;&#xA;&#x9;&#x9;createContents();&#xD;&#xA;&#x9;}&#xD;&#xA;&#xD;&#xA;&#xD;&#xA;&#x9;/**&#xD;&#xA;&#x9; * @generated&#xD;&#xA;&#x9; */&#xD;&#xA;&#x9;private void createContents(){&#xD;&#xA;&#x9;}&#xD;&#xA;&#x9;&#xD;&#xA;&#xD;&#xA;&#xD;&#xA;&#xD;&#xA;&#x9;/**&#xD;&#xA;&#x9; * @generated&#xD;&#xA;&#x9; */&#xD;&#xA;&#x9;private boolean myUseLocalCoordinates = false;&#xD;&#xA;&#xD;&#xA;&#x9;/**&#xD;&#xA;&#x9; * @generated&#xD;&#xA;&#x9; */&#xD;&#xA;&#x9;protected boolean useLocalCoordinates() {&#xD;&#xA;&#x9;&#x9;return myUseLocalCoordinates;&#xD;&#xA;&#x9;}&#xD;&#xA;&#xD;&#xA;&#x9;/**&#xD;&#xA;&#x9; * @generated&#xD;&#xA;&#x9; */&#xD;&#xA;&#x9;protected void setUseLocalCoordinates(boolean useLocalCoordinates) {&#xD;&#xA;&#x9;&#x9;myUseLocalCoordinates = useLocalCoordinates;&#xD;&#xA;&#x9;}&#xD;&#xA;&#x9;&#xD;&#xA;&#xD;&#xA;}&#xD;&#xA;&#x9;&#xD;&#xA;">
-          <requiredPluginIDs>org.eclipse.draw2d</requiredPluginIDs>
-          <requiredPluginIDs>org.eclipse.gmf.runtime.draw2d.ui</requiredPluginIDs>
-        </viewmap>
-        <modelFacet
-            xsi:type="gmfgen:FeatureLabelModelFacet"
-            editPattern="">
-          <metaFeature
-              href="../../org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>
-        </modelFacet>
-      </labels>
-    </topLevelNodes>
-    <topLevelNodes
-        visualID="1006"
-        editPartClassName="JoinNodeEditPart"
-        itemSemanticEditPolicyClassName="JoinNodeItemSemanticEditPolicy"
-        notationViewFactoryClassName="JoinNodeViewFactory"
-        canonicalEditPolicyClassName="JoinNodeCanonicalEditPolicy"
-        graphicalNodeEditPolicyClassName="JoinNodeGraphicalNodeEditPolicy">
-      <diagramRunTimeClass
-          href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
-      <elementType
-          xsi:type="gmfgen:MetamodelType"
-          editHelperClassName="JoinNodeEditHelper"/>
-      <viewmap
-          xsi:type="gmfgen:InnerClassViewmap"
-          className="ForkNodeFigure"
-          classBody="&#xD;&#xA;&#xD;&#xA;/**&#xD;&#xA; * @generated&#xD;&#xA; */&#xD;&#xA;public class ForkNodeFigure extends org.eclipse.draw2d.RectangleFigure {&#xD;&#xA;&#xD;&#xA;&#x9;/**&#xD;&#xA;&#x9; * @generated&#xD;&#xA;&#x9; */&#xD;&#xA;&#x9;public ForkNodeFigure() {&#x9;&#xD;&#xA;&#x9;&#x9;&#xD;&#xA;&#xD;&#xA;&#x9;&#x9;&#xD;&#xA;&#x9;&#x9;this.setBackgroundColor(FORKNODEFIGURE_BACK&#xD;&#xA;&#xD;&#xA;);&#xD;&#xA;&#x9;&#x9;this.setPreferredSize(getMapMode().DPtoLP(100), getMapMode().DPtoLP(8));&#xD;&#xA;&#x9;&#x9;this.setSize(getMapMode().DPtoLP(100), getMapMode().DPtoLP(8));&#xD;&#xA;&#x9;&#x9;createContents();&#xD;&#xA;&#x9;}&#xD;&#xA;&#xD;&#xA;&#xD;&#xA;&#x9;/**&#xD;&#xA;&#x9; * @generated&#xD;&#xA;&#x9; */&#xD;&#xA;&#x9;private void createContents(){&#xD;&#xA;&#x9;}&#xD;&#xA;&#x9;&#xD;&#xA;&#xD;&#xA;&#xD;&#xA;&#xD;&#xA;&#x9;/**&#xD;&#xA;&#x9; * @generated&#xD;&#xA;&#x9; */&#xD;&#xA;&#x9;private boolean myUseLocalCoordinates = false;&#xD;&#xA;&#xD;&#xA;&#x9;/**&#xD;&#xA;&#x9; * @generated&#xD;&#xA;&#x9; */&#xD;&#xA;&#x9;protected boolean useLocalCoordinates() {&#xD;&#xA;&#x9;&#x9;return myUseLocalCoordinates;&#xD;&#xA;&#x9;}&#xD;&#xA;&#xD;&#xA;&#x9;/**&#xD;&#xA;&#x9; * @generated&#xD;&#xA;&#x9; */&#xD;&#xA;&#x9;protected void setUseLocalCoordinates(boolean useLocalCoordinates) {&#xD;&#xA;&#x9;&#x9;myUseLocalCoordinates = useLocalCoordinates;&#xD;&#xA;&#x9;}&#xD;&#xA;&#x9;&#xD;&#xA;&#xD;&#xA;}&#xD;&#xA;&#x9;&#xD;&#xA;&#x9;&#xD;&#xA;&#x9;/**&#xD;&#xA;&#x9; * @generated&#xD;&#xA;&#x9; */&#xD;&#xA;&#x9;public static final org.eclipse.swt.graphics.Color FORKNODEFIGURE_BACK = new org.eclipse.swt.graphics.Color(null, 51, 102, 102);&#xD;&#xA;">
-        <attributes
-            xsi:type="gmfgen:StyleAttributes"
-            fixedBackground="true"/>
-        <attributes
-            xsi:type="gmfgen:ResizeConstraints"
-            resizeHandles="24"/>
-        <requiredPluginIDs>org.eclipse.draw2d</requiredPluginIDs>
-        <requiredPluginIDs>org.eclipse.gmf.runtime.draw2d.ui</requiredPluginIDs>
-      </viewmap>
-      <modelFacet>
-        <metaClass
-            href="../../org.eclipse.uml2.uml/model/UML.genmodel#//uml/JoinNode"/>
-        <containmentMetaFeature
-            href="../../org.eclipse.uml2.uml/model/UML.genmodel#//uml/Activity/node"/>
-        <childMetaFeature
-            href="../../org.eclipse.uml2.uml/model/UML.genmodel#//uml/Activity/node"/>
-      </modelFacet>
-    </topLevelNodes>
-    <topLevelNodes
-        visualID="1007"
-        editPartClassName="StructuredActivityNodeEditPart"
-        itemSemanticEditPolicyClassName="StructuredActivityNodeItemSemanticEditPolicy"
-        notationViewFactoryClassName="StructuredActivityNodeViewFactory"
-        canonicalEditPolicyClassName="StructuredActivityNodeCanonicalEditPolicy"
-        graphicalNodeEditPolicyClassName="StructuredActivityNodeGraphicalNodeEditPolicy">
-      <diagramRunTimeClass
-          href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
-      <elementType
-          xsi:type="gmfgen:MetamodelType"
-          editHelperClassName="StructuredActivityNodeEditHelper"/>
-      <viewmap
-          xsi:type="gmfgen:InnerClassViewmap"
-          className="StructuredActivityNodeFigure"
-          classBody="&#xD;&#xA;&#xD;&#xA;/**&#xD;&#xA; * @generated&#xD;&#xA; */&#xD;&#xA;public class StructuredActivityNodeFigure extends org.eclipse.draw2d.RectangleFigure {&#xD;&#xA;&#xD;&#xA;&#x9;/**&#xD;&#xA;&#x9; * @generated&#xD;&#xA;&#x9; */&#xD;&#xA;&#x9;public StructuredActivityNodeFigure() {&#x9;&#xD;&#xA;&#x9;&#x9;&#xD;&#xA;&#xD;&#xA;&#x9;&#x9;&#xD;&#xA;&#x9;&#x9;this.setOutline(false);&#xD;&#xA;&#x9;&#x9;createContents();&#xD;&#xA;&#x9;}&#xD;&#xA;&#xD;&#xA;&#xD;&#xA;&#x9;/**&#xD;&#xA;&#x9; * @generated&#xD;&#xA;&#x9; */&#xD;&#xA;&#x9;private void createContents(){&#xD;&#xA;&#x9;&#x9;org.eclipse.gmf.runtime.draw2d.ui.figures.WrapLabel fig_0 = new org.eclipse.gmf.runtime.draw2d.ui.figures.WrapLabel();&#xD;&#xA;fig_0.setText(&quot;&lt;...>&quot;);&#xD;&#xA;&#xD;&#xA;&#xD;&#xA;&#xD;&#xA;&#x9;&#x9;setFigureNodeNameFigure(fig_0);&#xD;&#xA;&#x9;&#x9;&#xD;&#xA;&#x9;&#x9;Object layData0 = null;&#xD;&#xA;&#xD;&#xA;&#x9;&#x9;this.add(fig_0, layData0);&#xD;&#xA;&#x9;}&#xD;&#xA;&#x9;&#xD;&#xA;&#x9;&#x9;&#xD;&#xA;&#x9;/**&#xD;&#xA;&#x9; * @generated&#xD;&#xA;&#x9; */&#xD;&#xA;&#x9;private org.eclipse.gmf.runtime.draw2d.ui.figures.WrapLabel fNodeNameFigure; &#xD;&#xA;&#xD;&#xA;&#x9;/**&#xD;&#xA;&#x9; * @generated&#xD;&#xA;&#x9; */&#xD;&#xA;&#x9;public org.eclipse.gmf.runtime.draw2d.ui.figures.WrapLabel getFigureNodeNameFigure() {&#xD;&#xA;&#x9;&#x9;return fNodeNameFigure;&#xD;&#xA;&#x9;}&#xD;&#xA;&#x9;&#xD;&#xA;&#x9;/**&#xD;&#xA;&#x9; * @generated&#xD;&#xA;&#x9; */&#xD;&#xA;&#x9;private void setFigureNodeNameFigure(org.eclipse.gmf.runtime.draw2d.ui.figures.WrapLabel fig){&#xD;&#xA;&#x9;&#x9;fNodeNameFigure = fig;&#xD;&#xA;&#x9;}&#xD;&#xA;&#xD;&#xA;&#xD;&#xA;&#xD;&#xA;&#xD;&#xA;&#x9;/**&#xD;&#xA;&#x9; * @generated&#xD;&#xA;&#x9; */&#xD;&#xA;&#x9;private boolean myUseLocalCoordinates = false;&#xD;&#xA;&#xD;&#xA;&#x9;/**&#xD;&#xA;&#x9; * @generated&#xD;&#xA;&#x9; */&#xD;&#xA;&#x9;protected boolean useLocalCoordinates() {&#xD;&#xA;&#x9;&#x9;return myUseLocalCoordinates;&#xD;&#xA;&#x9;}&#xD;&#xA;&#xD;&#xA;&#x9;/**&#xD;&#xA;&#x9; * @generated&#xD;&#xA;&#x9; */&#xD;&#xA;&#x9;protected void setUseLocalCoordinates(boolean useLocalCoordinates) {&#xD;&#xA;&#x9;&#x9;myUseLocalCoordinates = useLocalCoordinates;&#xD;&#xA;&#x9;}&#xD;&#xA;&#x9;&#xD;&#xA;&#xD;&#xA;}&#xD;&#xA;&#x9;&#xD;&#xA;">
-        <requiredPluginIDs>org.eclipse.draw2d</requiredPluginIDs>
-        <requiredPluginIDs>org.eclipse.gmf.runtime.draw2d.ui</requiredPluginIDs>
-      </viewmap>
-      <modelFacet>
-        <metaClass
-            href="../../org.eclipse.uml2.uml/model/UML.genmodel#//uml/StructuredActivityNode"/>
-        <containmentMetaFeature
-            href="../../org.eclipse.uml2.uml/model/UML.genmodel#//uml/Activity/node"/>
-        <childMetaFeature
-            href="../../org.eclipse.uml2.uml/model/UML.genmodel#//uml/Activity/node"/>
-        <modelElementSelector
-            body="getUmaType_Activity"
-            language="java"/>
-        <modelElementInitializer
-            xsi:type="gmfgen:GenFeatureSeqInitializer">
-          <initializers
-              body="createUmaType_Activity&#xD;&#xA;"
-              language="java">
-            <feature
-                href="../../../plugin/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore/EModelElement/eAnnotations"/>
-          </initializers>
-        </modelElementInitializer>
-      </modelFacet>
-      <labels
-          visualID="4005"
-          editPartClassName="StructuredActivityNodeNameEditPart"
-          itemSemanticEditPolicyClassName="StructuredActivityNodeNameItemSemanticEditPolicy"
-          notationViewFactoryClassName="StructuredActivityNodeNameViewFactory">
-        <diagramRunTimeClass
-            href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
-        <viewmap
-            xsi:type="gmfgen:ParentAssignedViewmap"
-            getterName="getFigureNodeNameFigure"
-            figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrapLabel"/>
-        <modelFacet
-            xsi:type="gmfgen:FeatureLabelModelFacet">
-          <metaFeature
-              href="../../org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>
-        </modelFacet>
-      </labels>
-    </topLevelNodes>
-    <topLevelNodes
-        visualID="1008"
-        editPartClassName="ActivityPartitionEditPart"
-        itemSemanticEditPolicyClassName="ActivityPartitionItemSemanticEditPolicy"
-        notationViewFactoryClassName="ActivityPartitionViewFactory"
-        canonicalEditPolicyClassName="ActivityPartitionCanonicalEditPolicy"
-        compartments="//@diagram/@compartments.0"
-        graphicalNodeEditPolicyClassName="ActivityPartitionGraphicalNodeEditPolicy">
-      <diagramRunTimeClass
-          href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
-      <elementType
-          xsi:type="gmfgen:MetamodelType"
-          editHelperClassName="ActivityPartitionEditHelper"/>
-      <viewmap
-          xsi:type="gmfgen:InnerClassViewmap"
-          layoutType="XY_LAYOUT"
-          className="ActivityPartitionFigure"
-          classBody="&#xD;&#xA;&#xD;&#xA;/**&#xD;&#xA; * @generated&#xD;&#xA; */&#xD;&#xA;public class ActivityPartitionFigure extends org.eclipse.draw2d.RectangleFigure {&#xD;&#xA;&#xD;&#xA;&#x9;/**&#xD;&#xA;&#x9; * @generated&#xD;&#xA;&#x9; */&#xD;&#xA;&#x9;public ActivityPartitionFigure() {&#x9;&#xD;&#xA;&#x9;&#x9;&#xD;&#xA;&#x9;&#x9;org.eclipse.draw2d.XYLayout myGenLayoutManager = new org.eclipse.draw2d.XYLayout();&#xD;&#xA;&#x9;&#x9;&#x9;&#xD;&#xA;&#x9;&#x9;this.setLayoutManager(myGenLayoutManager);&#xD;&#xA;&#xD;&#xA;&#x9;&#x9;&#x9;&#x9;this.setForegroundColor(org.eclipse.draw2d.ColorConstants.black&#xD;&#xA;&#xD;&#xA;);&#xD;&#xA;&#x9;&#x9;this.setBackgroundColor(ACTIVITYPARTITIONFIGURE_BACK&#xD;&#xA;&#xD;&#xA;);&#xD;&#xA;&#x9;&#x9;this.setPreferredSize(getMapMode().DPtoLP(400), getMapMode().DPtoLP(800));&#xD;&#xA;&#x9;&#x9;this.setSize(getMapMode().DPtoLP(100), getMapMode().DPtoLP(200));&#xD;&#xA;&#x9;&#x9;this.setBorder(&#xD;&#xA;new org.eclipse.draw2d.LineBorder()&#xD;&#xA;);&#xD;&#xA;&#x9;&#x9;createContents();&#xD;&#xA;&#x9;}&#xD;&#xA;&#xD;&#xA;&#xD;&#xA;&#x9;/**&#xD;&#xA;&#x9; * @generated&#xD;&#xA;&#x9; */&#xD;&#xA;&#x9;private void createContents(){&#xD;&#xA;&#x9;&#x9;org.eclipse.gmf.runtime.draw2d.ui.figures.WrapLabel fig_0 = new org.eclipse.gmf.runtime.draw2d.ui.figures.WrapLabel();&#xD;&#xA;&#xD;&#xA;&#xD;&#xA;&#xD;&#xA;&#xD;&#xA;&#x9;&#x9;setFigurePartitionLabelFigure(fig_0);&#xD;&#xA;&#x9;&#x9;&#xD;&#xA;&#x9;&#x9;Object layData0 = null;&#xD;&#xA;&#xD;&#xA;&#x9;&#x9;this.add(fig_0, layData0);&#xD;&#xA;&#x9;}&#xD;&#xA;&#x9;&#xD;&#xA;&#x9;&#x9;&#xD;&#xA;&#x9;/**&#xD;&#xA;&#x9; * @generated&#xD;&#xA;&#x9; */&#xD;&#xA;&#x9;private org.eclipse.gmf.runtime.draw2d.ui.figures.WrapLabel fPartitionLabelFigure; &#xD;&#xA;&#xD;&#xA;&#x9;/**&#xD;&#xA;&#x9; * @generated&#xD;&#xA;&#x9; */&#xD;&#xA;&#x9;public org.eclipse.gmf.runtime.draw2d.ui.figures.WrapLabel getFigurePartitionLabelFigure() {&#xD;&#xA;&#x9;&#x9;return fPartitionLabelFigure;&#xD;&#xA;&#x9;}&#xD;&#xA;&#x9;&#xD;&#xA;&#x9;/**&#xD;&#xA;&#x9; * @generated&#xD;&#xA;&#x9; */&#xD;&#xA;&#x9;private void setFigurePartitionLabelFigure(org.eclipse.gmf.runtime.draw2d.ui.figures.WrapLabel fig){&#xD;&#xA;&#x9;&#x9;fPartitionLabelFigure = fig;&#xD;&#xA;&#x9;}&#xD;&#xA;&#xD;&#xA;&#xD;&#xA;&#xD;&#xA;&#xD;&#xA;&#x9;/**&#xD;&#xA;&#x9; * @generated&#xD;&#xA;&#x9; */&#xD;&#xA;&#x9;private boolean myUseLocalCoordinates = false;&#xD;&#xA;&#xD;&#xA;&#x9;/**&#xD;&#xA;&#x9; * @generated&#xD;&#xA;&#x9; */&#xD;&#xA;&#x9;protected boolean useLocalCoordinates() {&#xD;&#xA;&#x9;&#x9;return myUseLocalCoordinates;&#xD;&#xA;&#x9;}&#xD;&#xA;&#xD;&#xA;&#x9;/**&#xD;&#xA;&#x9; * @generated&#xD;&#xA;&#x9; */&#xD;&#xA;&#x9;protected void setUseLocalCoordinates(boolean useLocalCoordinates) {&#xD;&#xA;&#x9;&#x9;myUseLocalCoordinates = useLocalCoordinates;&#xD;&#xA;&#x9;}&#xD;&#xA;&#x9;&#xD;&#xA;&#xD;&#xA;}&#xD;&#xA;&#x9;&#xD;&#xA;&#x9;&#xD;&#xA;&#x9;/**&#xD;&#xA;&#x9; * @generated&#xD;&#xA;&#x9; */&#xD;&#xA;&#x9;public static final org.eclipse.swt.graphics.Color ACTIVITYPARTITIONFIGURE_BACK = new org.eclipse.swt.graphics.Color(null, 255, 255, 255);&#xD;&#xA;">
-        <attributes
-            xsi:type="gmfgen:StyleAttributes"
-            fixedForeground="true"
-            fixedBackground="true"/>
-        <requiredPluginIDs>org.eclipse.draw2d</requiredPluginIDs>
-        <requiredPluginIDs>org.eclipse.gmf.runtime.draw2d.ui</requiredPluginIDs>
-      </viewmap>
-      <modelFacet>
-        <metaClass
-            href="../../org.eclipse.uml2.uml/model/UML.genmodel#//uml/ActivityPartition"/>
-        <containmentMetaFeature
-            href="../../org.eclipse.uml2.uml/model/UML.genmodel#//uml/Activity/group"/>
-        <childMetaFeature
-            href="../../org.eclipse.uml2.uml/model/UML.genmodel#//uml/Activity/group"/>
-      </modelFacet>
-      <labels
-          visualID="4007"
-          editPartClassName="ActivityPartitionName2EditPart"
-          itemSemanticEditPolicyClassName="ActivityPartitionName2ItemSemanticEditPolicy"
-          notationViewFactoryClassName="ActivityPartitionName2ViewFactory"
-          elementIcon="true">
-        <diagramRunTimeClass
-            href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
-        <viewmap
-            xsi:type="gmfgen:ParentAssignedViewmap"
-            getterName="getFigurePartitionLabelFigure"
-            figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrapLabel"/>
-        <modelFacet
-            xsi:type="gmfgen:FeatureLabelModelFacet"
-            viewPattern=""
-            editPattern="">
-          <metaFeature
-              href="../../org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>
-        </modelFacet>
-      </labels>
-    </topLevelNodes>
-    <topLevelNodes
-        visualID="1009"
-        editPartClassName="ActivityParameterNodeEditPart"
-        itemSemanticEditPolicyClassName="ActivityParameterNodeItemSemanticEditPolicy"
-        notationViewFactoryClassName="ActivityParameterNodeViewFactory"
-        canonicalEditPolicyClassName="ActivityParameterNodeCanonicalEditPolicy"
-        graphicalNodeEditPolicyClassName="ActivityParameterNodeGraphicalNodeEditPolicy">
-      <diagramRunTimeClass
-          href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
-      <elementType
-          xsi:type="gmfgen:MetamodelType"
-          editHelperClassName="ActivityParameterNodeEditHelper"/>
-      <viewmap
-          xsi:type="gmfgen:InnerClassViewmap"
-          className="ActivityParameterNodeFigure"
-          classBody="&#xD;&#xA;&#xD;&#xA;/**&#xD;&#xA; * @generated&#xD;&#xA; */&#xD;&#xA;public class ActivityParameterNodeFigure extends org.eclipse.draw2d.RectangleFigure {&#xD;&#xA;&#xD;&#xA;&#x9;/**&#xD;&#xA;&#x9; * @generated&#xD;&#xA;&#x9; */&#xD;&#xA;&#x9;public ActivityParameterNodeFigure() {&#x9;&#xD;&#xA;&#x9;&#x9;&#xD;&#xA;&#xD;&#xA;&#x9;&#x9;&#xD;&#xA;&#x9;&#x9;this.setOutline(false);&#xD;&#xA;&#x9;&#x9;createContents();&#xD;&#xA;&#x9;}&#xD;&#xA;&#xD;&#xA;&#xD;&#xA;&#x9;/**&#xD;&#xA;&#x9; * @generated&#xD;&#xA;&#x9; */&#xD;&#xA;&#x9;private void createContents(){&#xD;&#xA;&#x9;&#x9;org.eclipse.gmf.runtime.draw2d.ui.figures.WrapLabel fig_0 = new org.eclipse.gmf.runtime.draw2d.ui.figures.WrapLabel();&#xD;&#xA;&#xD;&#xA;&#xD;&#xA;&#xD;&#xA;&#xD;&#xA;&#x9;&#x9;setFigureActivityParameterNodeNameLabel(fig_0);&#xD;&#xA;&#x9;&#x9;&#xD;&#xA;&#x9;&#x9;Object layData0 = null;&#xD;&#xA;&#xD;&#xA;&#x9;&#x9;this.add(fig_0, layData0);&#xD;&#xA;&#x9;}&#xD;&#xA;&#x9;&#xD;&#xA;&#x9;&#x9;&#xD;&#xA;&#x9;/**&#xD;&#xA;&#x9; * @generated&#xD;&#xA;&#x9; */&#xD;&#xA;&#x9;private org.eclipse.gmf.runtime.draw2d.ui.figures.WrapLabel fActivityParameterNodeNameLabel; &#xD;&#xA;&#xD;&#xA;&#x9;/**&#xD;&#xA;&#x9; * @generated&#xD;&#xA;&#x9; */&#xD;&#xA;&#x9;public org.eclipse.gmf.runtime.draw2d.ui.figures.WrapLabel getFigureActivityParameterNodeNameLabel() {&#xD;&#xA;&#x9;&#x9;return fActivityParameterNodeNameLabel;&#xD;&#xA;&#x9;}&#xD;&#xA;&#x9;&#xD;&#xA;&#x9;/**&#xD;&#xA;&#x9; * @generated&#xD;&#xA;&#x9; */&#xD;&#xA;&#x9;private void setFigureActivityParameterNodeNameLabel(org.eclipse.gmf.runtime.draw2d.ui.figures.WrapLabel fig){&#xD;&#xA;&#x9;&#x9;fActivityParameterNodeNameLabel = fig;&#xD;&#xA;&#x9;}&#xD;&#xA;&#xD;&#xA;&#xD;&#xA;&#xD;&#xA;&#xD;&#xA;&#x9;/**&#xD;&#xA;&#x9; * @generated&#xD;&#xA;&#x9; */&#xD;&#xA;&#x9;private boolean myUseLocalCoordinates = false;&#xD;&#xA;&#xD;&#xA;&#x9;/**&#xD;&#xA;&#x9; * @generated&#xD;&#xA;&#x9; */&#xD;&#xA;&#x9;protected boolean useLocalCoordinates() {&#xD;&#xA;&#x9;&#x9;return myUseLocalCoordinates;&#xD;&#xA;&#x9;}&#xD;&#xA;&#xD;&#xA;&#x9;/**&#xD;&#xA;&#x9; * @generated&#xD;&#xA;&#x9; */&#xD;&#xA;&#x9;protected void setUseLocalCoordinates(boolean useLocalCoordinates) {&#xD;&#xA;&#x9;&#x9;myUseLocalCoordinates = useLocalCoordinates;&#xD;&#xA;&#x9;}&#xD;&#xA;&#x9;&#xD;&#xA;&#xD;&#xA;}&#xD;&#xA;&#x9;&#xD;&#xA;">
-        <requiredPluginIDs>org.eclipse.draw2d</requiredPluginIDs>
-        <requiredPluginIDs>org.eclipse.gmf.runtime.draw2d.ui</requiredPluginIDs>
-      </viewmap>
-      <modelFacet>
-        <metaClass
-            href="../../org.eclipse.uml2.uml/model/UML.genmodel#//uml/ActivityParameterNode"/>
-        <containmentMetaFeature
-            href="../../org.eclipse.uml2.uml/model/UML.genmodel#//uml/Activity/node"/>
-        <childMetaFeature
-            href="../../org.eclipse.uml2.uml/model/UML.genmodel#//uml/Activity/node"/>
-        <modelElementSelector
-            body="getUmaType_TaskDescriptor"
-            language="java"/>
-        <modelElementInitializer
-            xsi:type="gmfgen:GenFeatureSeqInitializer">
-          <initializers
-              body="createUmaType_TaskDescriptor"
-              language="java">
-            <feature
-                href="../../../plugin/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore/EModelElement/eAnnotations"/>
-          </initializers>
-        </modelElementInitializer>
-      </modelFacet>
-      <labels
-          visualID="4008"
-          editPartClassName="ActivityParameterNodeNameEditPart"
-          itemSemanticEditPolicyClassName="ActivityParameterNodeNameItemSemanticEditPolicy"
-          notationViewFactoryClassName="ActivityParameterNodeNameViewFactory">
-        <diagramRunTimeClass
-            href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
-        <viewmap
-            xsi:type="gmfgen:ParentAssignedViewmap"
-            getterName="getFigureActivityParameterNodeNameLabel"
-            figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrapLabel"/>
-        <modelFacet
-            xsi:type="gmfgen:FeatureLabelModelFacet">
-          <metaFeature
-              href="../../org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>
-        </modelFacet>
-      </labels>
-    </topLevelNodes>
-    <topLevelNodes
-        visualID="1010"
-        editPartClassName="StructuredActivityNode2EditPart"
-        itemSemanticEditPolicyClassName="StructuredActivityNode2ItemSemanticEditPolicy"
-        notationViewFactoryClassName="StructuredActivityNode2ViewFactory"
-        canonicalEditPolicyClassName="StructuredActivityNode2CanonicalEditPolicy"
-        graphicalNodeEditPolicyClassName="StructuredActivityNode2GraphicalNodeEditPolicy">
-      <diagramRunTimeClass
-          href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
-      <elementType
-          xsi:type="gmfgen:SpecializationType"
-          metamodelType="//@diagram/@topLevelNodes.6/@elementType"
-          editHelperAdviceClassName="StructuredActivityNodeEditHelperAdvice"/>
-      <viewmap
-          xsi:type="gmfgen:InnerClassViewmap"
-          className="StructuredActivityNodeFigure"
-          classBody="&#xD;&#xA;&#xD;&#xA;/**&#xD;&#xA; * @generated&#xD;&#xA; */&#xD;&#xA;public class StructuredActivityNodeFigure extends org.eclipse.draw2d.RectangleFigure {&#xD;&#xA;&#xD;&#xA;&#x9;/**&#xD;&#xA;&#x9; * @generated&#xD;&#xA;&#x9; */&#xD;&#xA;&#x9;public StructuredActivityNodeFigure() {&#x9;&#xD;&#xA;&#x9;&#x9;&#xD;&#xA;&#xD;&#xA;&#x9;&#x9;&#xD;&#xA;&#x9;&#x9;this.setOutline(false);&#xD;&#xA;&#x9;&#x9;createContents();&#xD;&#xA;&#x9;}&#xD;&#xA;&#xD;&#xA;&#xD;&#xA;&#x9;/**&#xD;&#xA;&#x9; * @generated&#xD;&#xA;&#x9; */&#xD;&#xA;&#x9;private void createContents(){&#xD;&#xA;&#x9;&#x9;org.eclipse.gmf.runtime.draw2d.ui.figures.WrapLabel fig_0 = new org.eclipse.gmf.runtime.draw2d.ui.figures.WrapLabel();&#xD;&#xA;fig_0.setText(&quot;&lt;...>&quot;);&#xD;&#xA;&#xD;&#xA;&#xD;&#xA;&#xD;&#xA;&#x9;&#x9;setFigureNodeNameFigure(fig_0);&#xD;&#xA;&#x9;&#x9;&#xD;&#xA;&#x9;&#x9;Object layData0 = null;&#xD;&#xA;&#xD;&#xA;&#x9;&#x9;this.add(fig_0, layData0);&#xD;&#xA;&#x9;}&#xD;&#xA;&#x9;&#xD;&#xA;&#x9;&#x9;&#xD;&#xA;&#x9;/**&#xD;&#xA;&#x9; * @generated&#xD;&#xA;&#x9; */&#xD;&#xA;&#x9;private org.eclipse.gmf.runtime.draw2d.ui.figures.WrapLabel fNodeNameFigure; &#xD;&#xA;&#xD;&#xA;&#x9;/**&#xD;&#xA;&#x9; * @generated&#xD;&#xA;&#x9; */&#xD;&#xA;&#x9;public org.eclipse.gmf.runtime.draw2d.ui.figures.WrapLabel getFigureNodeNameFigure() {&#xD;&#xA;&#x9;&#x9;return fNodeNameFigure;&#xD;&#xA;&#x9;}&#xD;&#xA;&#x9;&#xD;&#xA;&#x9;/**&#xD;&#xA;&#x9; * @generated&#xD;&#xA;&#x9; */&#xD;&#xA;&#x9;private void setFigureNodeNameFigure(org.eclipse.gmf.runtime.draw2d.ui.figures.WrapLabel fig){&#xD;&#xA;&#x9;&#x9;fNodeNameFigure = fig;&#xD;&#xA;&#x9;}&#xD;&#xA;&#xD;&#xA;&#xD;&#xA;&#xD;&#xA;&#xD;&#xA;&#x9;/**&#xD;&#xA;&#x9; * @generated&#xD;&#xA;&#x9; */&#xD;&#xA;&#x9;private boolean myUseLocalCoordinates = false;&#xD;&#xA;&#xD;&#xA;&#x9;/**&#xD;&#xA;&#x9; * @generated&#xD;&#xA;&#x9; */&#xD;&#xA;&#x9;protected boolean useLocalCoordinates() {&#xD;&#xA;&#x9;&#x9;return myUseLocalCoordinates;&#xD;&#xA;&#x9;}&#xD;&#xA;&#xD;&#xA;&#x9;/**&#xD;&#xA;&#x9; * @generated&#xD;&#xA;&#x9; */&#xD;&#xA;&#x9;protected void setUseLocalCoordinates(boolean useLocalCoordinates) {&#xD;&#xA;&#x9;&#x9;myUseLocalCoordinates = useLocalCoordinates;&#xD;&#xA;&#x9;}&#xD;&#xA;&#x9;&#xD;&#xA;&#xD;&#xA;}&#xD;&#xA;&#x9;&#xD;&#xA;">
-        <requiredPluginIDs>org.eclipse.draw2d</requiredPluginIDs>
-        <requiredPluginIDs>org.eclipse.gmf.runtime.draw2d.ui</requiredPluginIDs>
-      </viewmap>
-      <modelFacet>
-        <metaClass
-            href="../../org.eclipse.uml2.uml/model/UML.genmodel#//uml/StructuredActivityNode"/>
-        <containmentMetaFeature
-            href="../../org.eclipse.uml2.uml/model/UML.genmodel#//uml/Activity/node"/>
-        <childMetaFeature
-            href="../../org.eclipse.uml2.uml/model/UML.genmodel#//uml/Activity/node"/>
-        <modelElementSelector
-            body="getUmaType_Phase"
-            language="java"/>
-        <modelElementInitializer
-            xsi:type="gmfgen:GenFeatureSeqInitializer">
-          <initializers
-              body="createUmaType_Phase"
-              language="java">
-            <feature
-                href="../../../plugin/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore/EModelElement/eAnnotations"/>
-          </initializers>
-        </modelElementInitializer>
-      </modelFacet>
-      <labels
-          visualID="4009"
-          editPartClassName="StructuredActivityNodeName2EditPart"
-          itemSemanticEditPolicyClassName="StructuredActivityNodeName2ItemSemanticEditPolicy"
-          notationViewFactoryClassName="StructuredActivityNodeName2ViewFactory">
-        <diagramRunTimeClass
-            href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
-        <viewmap
-            xsi:type="gmfgen:ParentAssignedViewmap"
-            getterName="getFigureNodeNameFigure"
-            figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrapLabel"/>
-        <modelFacet
-            xsi:type="gmfgen:FeatureLabelModelFacet">
-          <metaFeature
-              href="../../org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>
-        </modelFacet>
-      </labels>
-    </topLevelNodes>
-    <topLevelNodes
-        visualID="1011"
-        editPartClassName="StructuredActivityNode3EditPart"
-        itemSemanticEditPolicyClassName="StructuredActivityNode3ItemSemanticEditPolicy"
-        notationViewFactoryClassName="StructuredActivityNode3ViewFactory"
-        canonicalEditPolicyClassName="StructuredActivityNode3CanonicalEditPolicy"
-        graphicalNodeEditPolicyClassName="StructuredActivityNode3GraphicalNodeEditPolicy">
-      <diagramRunTimeClass
-          href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
-      <elementType
-          xsi:type="gmfgen:SpecializationType"
-          metamodelType="//@diagram/@topLevelNodes.6/@elementType"
-          editHelperAdviceClassName="StructuredActivityNode2EditHelperAdvice"/>
-      <viewmap
-          xsi:type="gmfgen:InnerClassViewmap"
-          className="StructuredActivityNodeFigure"
-          classBody="&#xD;&#xA;&#xD;&#xA;/**&#xD;&#xA; * @generated&#xD;&#xA; */&#xD;&#xA;public class StructuredActivityNodeFigure extends org.eclipse.draw2d.RectangleFigure {&#xD;&#xA;&#xD;&#xA;&#x9;/**&#xD;&#xA;&#x9; * @generated&#xD;&#xA;&#x9; */&#xD;&#xA;&#x9;public StructuredActivityNodeFigure() {&#x9;&#xD;&#xA;&#x9;&#x9;&#xD;&#xA;&#xD;&#xA;&#x9;&#x9;&#xD;&#xA;&#x9;&#x9;this.setOutline(false);&#xD;&#xA;&#x9;&#x9;createContents();&#xD;&#xA;&#x9;}&#xD;&#xA;&#xD;&#xA;&#xD;&#xA;&#x9;/**&#xD;&#xA;&#x9; * @generated&#xD;&#xA;&#x9; */&#xD;&#xA;&#x9;private void createContents(){&#xD;&#xA;&#x9;&#x9;org.eclipse.gmf.runtime.draw2d.ui.figures.WrapLabel fig_0 = new org.eclipse.gmf.runtime.draw2d.ui.figures.WrapLabel();&#xD;&#xA;fig_0.setText(&quot;&lt;...>&quot;);&#xD;&#xA;&#xD;&#xA;&#xD;&#xA;&#xD;&#xA;&#x9;&#x9;setFigureNodeNameFigure(fig_0);&#xD;&#xA;&#x9;&#x9;&#xD;&#xA;&#x9;&#x9;Object layData0 = null;&#xD;&#xA;&#xD;&#xA;&#x9;&#x9;this.add(fig_0, layData0);&#xD;&#xA;&#x9;}&#xD;&#xA;&#x9;&#xD;&#xA;&#x9;&#x9;&#xD;&#xA;&#x9;/**&#xD;&#xA;&#x9; * @generated&#xD;&#xA;&#x9; */&#xD;&#xA;&#x9;private org.eclipse.gmf.runtime.draw2d.ui.figures.WrapLabel fNodeNameFigure; &#xD;&#xA;&#xD;&#xA;&#x9;/**&#xD;&#xA;&#x9; * @generated&#xD;&#xA;&#x9; */&#xD;&#xA;&#x9;public org.eclipse.gmf.runtime.draw2d.ui.figures.WrapLabel getFigureNodeNameFigure() {&#xD;&#xA;&#x9;&#x9;return fNodeNameFigure;&#xD;&#xA;&#x9;}&#xD;&#xA;&#x9;&#xD;&#xA;&#x9;/**&#xD;&#xA;&#x9; * @generated&#xD;&#xA;&#x9; */&#xD;&#xA;&#x9;private void setFigureNodeNameFigure(org.eclipse.gmf.runtime.draw2d.ui.figures.WrapLabel fig){&#xD;&#xA;&#x9;&#x9;fNodeNameFigure = fig;&#xD;&#xA;&#x9;}&#xD;&#xA;&#xD;&#xA;&#xD;&#xA;&#xD;&#xA;&#xD;&#xA;&#x9;/**&#xD;&#xA;&#x9; * @generated&#xD;&#xA;&#x9; */&#xD;&#xA;&#x9;private boolean myUseLocalCoordinates = false;&#xD;&#xA;&#xD;&#xA;&#x9;/**&#xD;&#xA;&#x9; * @generated&#xD;&#xA;&#x9; */&#xD;&#xA;&#x9;protected boolean useLocalCoordinates() {&#xD;&#xA;&#x9;&#x9;return myUseLocalCoordinates;&#xD;&#xA;&#x9;}&#xD;&#xA;&#xD;&#xA;&#x9;/**&#xD;&#xA;&#x9; * @generated&#xD;&#xA;&#x9; */&#xD;&#xA;&#x9;protected void setUseLocalCoordinates(boolean useLocalCoordinates) {&#xD;&#xA;&#x9;&#x9;myUseLocalCoordinates = useLocalCoordinates;&#xD;&#xA;&#x9;}&#xD;&#xA;&#x9;&#xD;&#xA;&#xD;&#xA;}&#xD;&#xA;&#x9;&#xD;&#xA;">
-        <requiredPluginIDs>org.eclipse.draw2d</requiredPluginIDs>
-        <requiredPluginIDs>org.eclipse.gmf.runtime.draw2d.ui</requiredPluginIDs>
-      </viewmap>
-      <modelFacet>
-        <metaClass
-            href="../../org.eclipse.uml2.uml/model/UML.genmodel#//uml/StructuredActivityNode"/>
-        <containmentMetaFeature
-            href="../../org.eclipse.uml2.uml/model/UML.genmodel#//uml/Activity/node"/>
-        <childMetaFeature
-            href="../../org.eclipse.uml2.uml/model/UML.genmodel#//uml/Activity/node"/>
-        <modelElementSelector
-            body="getUmaType_Iteration"
-            language="java"/>
-        <modelElementInitializer
-            xsi:type="gmfgen:GenFeatureSeqInitializer">
-          <initializers
-              body="createUmaType_Iteration"
-              language="java">
-            <feature
-                href="../../../plugin/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore/EModelElement/eAnnotations"/>
-          </initializers>
-        </modelElementInitializer>
-      </modelFacet>
-      <labels
-          visualID="4010"
-          editPartClassName="StructuredActivityNodeName3EditPart"
-          itemSemanticEditPolicyClassName="StructuredActivityNodeName3ItemSemanticEditPolicy"
-          notationViewFactoryClassName="StructuredActivityNodeName3ViewFactory">
-        <diagramRunTimeClass
-            href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
-        <viewmap
-            xsi:type="gmfgen:ParentAssignedViewmap"
-            getterName="getFigureNodeNameFigure"
-            figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrapLabel"/>
-        <modelFacet
-            xsi:type="gmfgen:FeatureLabelModelFacet">
-          <metaFeature
-              href="../../org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>
-        </modelFacet>
-      </labels>
-    </topLevelNodes>
-    <topLevelNodes
-        visualID="1012"
-        editPartClassName="ActivityParameterNode2EditPart"
-        itemSemanticEditPolicyClassName="ActivityParameterNode2ItemSemanticEditPolicy"
-        notationViewFactoryClassName="ActivityParameterNode2ViewFactory"
-        canonicalEditPolicyClassName="ActivityParameterNode2CanonicalEditPolicy"
-        graphicalNodeEditPolicyClassName="ActivityParameterNode2GraphicalNodeEditPolicy">
-      <diagramRunTimeClass
-          href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
-      <elementType
-          xsi:type="gmfgen:SpecializationType"
-          metamodelType="//@diagram/@topLevelNodes.8/@elementType"
-          editHelperAdviceClassName="ActivityParameterNodeEditHelperAdvice"/>
-      <viewmap
-          xsi:type="gmfgen:InnerClassViewmap"
-          className="ActivityParameterNodeFigure"
-          classBody="&#xD;&#xA;&#xD;&#xA;/**&#xD;&#xA; * @generated&#xD;&#xA; */&#xD;&#xA;public class ActivityParameterNodeFigure extends org.eclipse.draw2d.RectangleFigure {&#xD;&#xA;&#xD;&#xA;&#x9;/**&#xD;&#xA;&#x9; * @generated&#xD;&#xA;&#x9; */&#xD;&#xA;&#x9;public ActivityParameterNodeFigure() {&#x9;&#xD;&#xA;&#x9;&#x9;&#xD;&#xA;&#xD;&#xA;&#x9;&#x9;&#xD;&#xA;&#x9;&#x9;this.setOutline(false);&#xD;&#xA;&#x9;&#x9;createContents();&#xD;&#xA;&#x9;}&#xD;&#xA;&#xD;&#xA;&#xD;&#xA;&#x9;/**&#xD;&#xA;&#x9; * @generated&#xD;&#xA;&#x9; */&#xD;&#xA;&#x9;private void createContents(){&#xD;&#xA;&#x9;&#x9;org.eclipse.gmf.runtime.draw2d.ui.figures.WrapLabel fig_0 = new org.eclipse.gmf.runtime.draw2d.ui.figures.WrapLabel();&#xD;&#xA;&#xD;&#xA;&#xD;&#xA;&#xD;&#xA;&#xD;&#xA;&#x9;&#x9;setFigureActivityParameterNodeNameLabel(fig_0);&#xD;&#xA;&#x9;&#x9;&#xD;&#xA;&#x9;&#x9;Object layData0 = null;&#xD;&#xA;&#xD;&#xA;&#x9;&#x9;this.add(fig_0, layData0);&#xD;&#xA;&#x9;}&#xD;&#xA;&#x9;&#xD;&#xA;&#x9;&#x9;&#xD;&#xA;&#x9;/**&#xD;&#xA;&#x9; * @generated&#xD;&#xA;&#x9; */&#xD;&#xA;&#x9;private org.eclipse.gmf.runtime.draw2d.ui.figures.WrapLabel fActivityParameterNodeNameLabel; &#xD;&#xA;&#xD;&#xA;&#x9;/**&#xD;&#xA;&#x9; * @generated&#xD;&#xA;&#x9; */&#xD;&#xA;&#x9;public org.eclipse.gmf.runtime.draw2d.ui.figures.WrapLabel getFigureActivityParameterNodeNameLabel() {&#xD;&#xA;&#x9;&#x9;return fActivityParameterNodeNameLabel;&#xD;&#xA;&#x9;}&#xD;&#xA;&#x9;&#xD;&#xA;&#x9;/**&#xD;&#xA;&#x9; * @generated&#xD;&#xA;&#x9; */&#xD;&#xA;&#x9;private void setFigureActivityParameterNodeNameLabel(org.eclipse.gmf.runtime.draw2d.ui.figures.WrapLabel fig){&#xD;&#xA;&#x9;&#x9;fActivityParameterNodeNameLabel = fig;&#xD;&#xA;&#x9;}&#xD;&#xA;&#xD;&#xA;&#xD;&#xA;&#xD;&#xA;&#xD;&#xA;&#x9;/**&#xD;&#xA;&#x9; * @generated&#xD;&#xA;&#x9; */&#xD;&#xA;&#x9;private boolean myUseLocalCoordinates = false;&#xD;&#xA;&#xD;&#xA;&#x9;/**&#xD;&#xA;&#x9; * @generated&#xD;&#xA;&#x9; */&#xD;&#xA;&#x9;protected boolean useLocalCoordinates() {&#xD;&#xA;&#x9;&#x9;return myUseLocalCoordinates;&#xD;&#xA;&#x9;}&#xD;&#xA;&#xD;&#xA;&#x9;/**&#xD;&#xA;&#x9; * @generated&#xD;&#xA;&#x9; */&#xD;&#xA;&#x9;protected void setUseLocalCoordinates(boolean useLocalCoordinates) {&#xD;&#xA;&#x9;&#x9;myUseLocalCoordinates = useLocalCoordinates;&#xD;&#xA;&#x9;}&#xD;&#xA;&#x9;&#xD;&#xA;&#xD;&#xA;}&#xD;&#xA;&#x9;&#xD;&#xA;">
-        <requiredPluginIDs>org.eclipse.draw2d</requiredPluginIDs>
-        <requiredPluginIDs>org.eclipse.gmf.runtime.draw2d.ui</requiredPluginIDs>
-      </viewmap>
-      <modelFacet>
-        <metaClass
-            href="../../org.eclipse.uml2.uml/model/UML.genmodel#//uml/ActivityParameterNode"/>
-        <containmentMetaFeature
-            href="../../org.eclipse.uml2.uml/model/UML.genmodel#//uml/Activity/node"/>
-        <childMetaFeature
-            href="../../org.eclipse.uml2.uml/model/UML.genmodel#//uml/Activity/node"/>
-        <modelElementSelector
-            body="getUmaType_Milestone"
-            language="java"/>
-        <modelElementInitializer
-            xsi:type="gmfgen:GenFeatureSeqInitializer">
-          <initializers
-              body="createUmaType_Milestone"
-              language="java">
-            <feature
-                href="../../../plugin/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore/EModelElement/eAnnotations"/>
-          </initializers>
-        </modelElementInitializer>
-      </modelFacet>
-      <labels
-          visualID="4011"
-          editPartClassName="ActivityParameterNodeName2EditPart"
-          itemSemanticEditPolicyClassName="ActivityParameterNodeName2ItemSemanticEditPolicy"
-          notationViewFactoryClassName="ActivityParameterNodeName2ViewFactory">
-        <diagramRunTimeClass
-            href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
-        <viewmap
-            xsi:type="gmfgen:ParentAssignedViewmap"
-            getterName="getFigureActivityParameterNodeNameLabel"
-            figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrapLabel"/>
-        <modelFacet
-            xsi:type="gmfgen:FeatureLabelModelFacet">
-          <metaFeature
-              href="../../org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>
-        </modelFacet>
-      </labels>
-    </topLevelNodes>
-    <links
-        visualID="3001"
-        editPartClassName="ControlFlowEditPart"
-        itemSemanticEditPolicyClassName="ControlFlowItemSemanticEditPolicy"
-        notationViewFactoryClassName="ControlFlowViewFactory">
-      <diagramRunTimeClass
-          href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Edge"/>
-      <elementType
-          xsi:type="gmfgen:MetamodelType"
-          editHelperClassName="ControlFlowEditHelper"/>
-      <viewmap
-          xsi:type="gmfgen:InnerClassViewmap"
-          className="ControlFlowFigure"
-          classBody="&#xD;&#xA;&#xD;&#xA;/**&#xD;&#xA; * @generated&#xD;&#xA; */&#xD;&#xA;public class ControlFlowFigure extends org.eclipse.gmf.runtime.draw2d.ui.figures.PolylineConnectionEx {&#xD;&#xA;&#xD;&#xA;&#x9;/**&#xD;&#xA;&#x9; * @generated&#xD;&#xA;&#x9; */&#xD;&#xA;&#x9;public ControlFlowFigure() {&#xD;&#xA;&#xD;&#xA;&#x9;&#x9;setTargetDecoration(createTargetDecoration());&#xD;&#xA;&#x9;}&#xD;&#xA;&#xD;&#xA;&#xD;&#xA;&#x9;/**&#xD;&#xA;&#x9; * @generated&#xD;&#xA;&#x9; */&#xD;&#xA;&#x9;private org.eclipse.draw2d.PolylineDecoration createTargetDecoration() {&#xD;&#xA;org.eclipse.draw2d.PolylineDecoration df = new org.eclipse.draw2d.PolylineDecoration();&#xD;&#xA;// dispatchNext?&#xD;&#xA;&#xD;&#xA;&#x9;&#x9;org.eclipse.draw2d.geometry.PointList pl = new org.eclipse.draw2d.geometry.PointList();&#xD;&#xA;&#x9;&#x9;pl.addPoint(-1, 1);&#xD;&#xA;&#x9;&#x9;pl.addPoint(0, 0);&#xD;&#xA;&#x9;&#x9;pl.addPoint(-1, -1);&#xD;&#xA;&#x9;&#x9;df.setTemplate(pl);&#xD;&#xA;&#x9;&#x9;df.setScale(getMapMode().DPtoLP(7), getMapMode().DPtoLP(3));&#xD;&#xA;&#xD;&#xA;&#xD;&#xA;&#xD;&#xA;&#xD;&#xA;&#x9;&#x9;return df;&#xD;&#xA;&#x9;}&#xD;&#xA;&#xD;&#xA;}&#xD;&#xA;&#x9;&#xD;&#xA;">
-        <requiredPluginIDs>org.eclipse.draw2d</requiredPluginIDs>
-        <requiredPluginIDs>org.eclipse.gmf.runtime.draw2d.ui</requiredPluginIDs>
-      </viewmap>
-      <modelFacet
-          xsi:type="gmfgen:TypeLinkModelFacet">
-        <metaClass
-            href="../../org.eclipse.uml2.uml/model/UML.genmodel#//uml/ControlFlow"/>
-        <containmentMetaFeature
-            href="../../org.eclipse.uml2.uml/model/UML.genmodel#//uml/StructuredActivityNode/edge"/>
-        <childMetaFeature
-            href="../../org.eclipse.uml2.uml/model/UML.genmodel#//uml/StructuredActivityNode/edge"/>
-        <sourceMetaFeature
-            href="../../org.eclipse.uml2.uml/model/UML.genmodel#//uml/ActivityEdge/source"/>
-        <targetMetaFeature
-            href="../../org.eclipse.uml2.uml/model/UML.genmodel#//uml/ActivityEdge/target"/>
-      </modelFacet>
-      <labels
-          visualID="4012"
-          editPartClassName="ControlFlowNameEditPart"
-          itemSemanticEditPolicyClassName="ControlFlowNameItemSemanticEditPolicy"
-          notationViewFactoryClassName="ControlFlowNameViewFactory"
-          elementIcon="true">
-        <diagramRunTimeClass
-            href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
-        <viewmap
-            xsi:type="gmfgen:InnerClassViewmap"
-            className="ControlFlowLabelFigure"
-            classBody="&#xD;&#xA;&#xD;&#xA;/**&#xD;&#xA; * @generated&#xD;&#xA; */&#xD;&#xA;public class ControlFlowLabelFigure extends org.eclipse.gmf.runtime.draw2d.ui.figures.WrapLabel {&#xD;&#xA;&#xD;&#xA;&#x9;/**&#xD;&#xA;&#x9; * @generated&#xD;&#xA;&#x9; */&#xD;&#xA;&#x9;public ControlFlowLabelFigure() {&#x9;&#xD;&#xA;&#x9;&#x9;&#xD;&#xA;&#xD;&#xA;&#x9;&#x9;this.setText(&quot;&quot;);&#xD;&#xA;&#x9;&#x9;createContents();&#xD;&#xA;&#x9;}&#xD;&#xA;&#xD;&#xA;&#xD;&#xA;&#x9;/**&#xD;&#xA;&#x9; * @generated&#xD;&#xA;&#x9; */&#xD;&#xA;&#x9;private void createContents(){&#xD;&#xA;&#x9;}&#xD;&#xA;&#x9;&#xD;&#xA;&#xD;&#xA;&#xD;&#xA;&#xD;&#xA;&#x9;/**&#xD;&#xA;&#x9; * @generated&#xD;&#xA;&#x9; */&#xD;&#xA;&#x9;private boolean myUseLocalCoordinates = false;&#xD;&#xA;&#xD;&#xA;&#x9;/**&#xD;&#xA;&#x9; * @generated&#xD;&#xA;&#x9; */&#xD;&#xA;&#x9;protected boolean useLocalCoordinates() {&#xD;&#xA;&#x9;&#x9;return myUseLocalCoordinates;&#xD;&#xA;&#x9;}&#xD;&#xA;&#xD;&#xA;&#x9;/**&#xD;&#xA;&#x9; * @generated&#xD;&#xA;&#x9; */&#xD;&#xA;&#x9;protected void setUseLocalCoordinates(boolean useLocalCoordinates) {&#xD;&#xA;&#x9;&#x9;myUseLocalCoordinates = useLocalCoordinates;&#xD;&#xA;&#x9;}&#xD;&#xA;&#x9;&#xD;&#xA;&#xD;&#xA;}&#xD;&#xA;&#x9;&#xD;&#xA;">
-          <attributes
-              xsi:type="gmfgen:LabelOffsetAttributes"
-              y="40"/>
-          <requiredPluginIDs>org.eclipse.draw2d</requiredPluginIDs>
-          <requiredPluginIDs>org.eclipse.gmf.runtime.draw2d.ui</requiredPluginIDs>
-        </viewmap>
-        <modelFacet
-            xsi:type="gmfgen:FeatureLabelModelFacet"
-            viewPattern=""
-            editPattern="">
-          <metaFeature
-              href="../../org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>
-        </modelFacet>
-      </labels>
-    </links>
-    <compartments
-        visualID="5001"
-        editPartClassName="ActivityPartitionPartitionCampartmentEditPart"
-        itemSemanticEditPolicyClassName="ActivityPartitionPartitionCampartmentItemSemanticEditPolicy"
-        notationViewFactoryClassName="ActivityPartitionPartitionCampartmentViewFactory"
-        childNodes="//@diagram/@childNodes.0"
-        canonicalEditPolicyClassName="ActivityPartitionPartitionCampartmentCanonicalEditPolicy"
-        title="PartitionCampartment"
-        canCollapse="false"
-        needsTitle="false"
-        node="//@diagram/@topLevelNodes.7"
-        listLayout="false">
-      <diagramRunTimeClass
-          href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
-      <viewmap
-          xsi:type="gmfgen:FigureViewmap"
-          figureQualifiedClassName="org.eclipse.gmf.runtime.diagram.ui.figures.ResizableCompartmentFigure">
-        <requiredPluginIDs>org.eclipse.draw2d</requiredPluginIDs>
-        <requiredPluginIDs>org.eclipse.gmf.runtime.draw2d.ui</requiredPluginIDs>
-      </viewmap>
-    </compartments>
-    <compartments
-        visualID="5002"
-        editPartClassName="ActivityPartitionPartitionCampartment2EditPart"
-        itemSemanticEditPolicyClassName="ActivityPartitionPartitionCampartment2ItemSemanticEditPolicy"
-        notationViewFactoryClassName="ActivityPartitionPartitionCampartment2ViewFactory"
-        childNodes="//@diagram/@childNodes.0"
-        canonicalEditPolicyClassName="ActivityPartitionPartitionCampartment2CanonicalEditPolicy"
-        title="PartitionCampartment"
-        canCollapse="false"
-        needsTitle="false"
-        node="//@diagram/@childNodes.0"
-        listLayout="false">
-      <diagramRunTimeClass
-          href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
-      <viewmap
-          xsi:type="gmfgen:FigureViewmap"
-          figureQualifiedClassName="org.eclipse.gmf.runtime.diagram.ui.figures.ResizableCompartmentFigure">
-        <requiredPluginIDs>org.eclipse.draw2d</requiredPluginIDs>
-        <requiredPluginIDs>org.eclipse.gmf.runtime.draw2d.ui</requiredPluginIDs>
-      </viewmap>
-    </compartments>
-    <palette>
-      <groups
-          title="Flows"
-          description="Creation tool for flows"
-          collapse="true">
-        <entries
-            xsi:type="gmfgen:ToolEntry"
-            title="Control Flow"
-            description="Create new Control Flow"
-            smallIconPath="/org.eclipse.epf.diagramming/icons/full/obj16/ControlFlow.gif"
-            genLinks="//@diagram/@links.0"/>
-      </groups>
-      <groups
-          title="Nodes"
-          description="Creation tool group for nodes"
-          collapse="true">
-        <entries
-            xsi:type="gmfgen:ToolEntry"
-            title="Activity Partition"
-            description="Create new Activity Partition"
-            smallIconPath="/org.eclipse.epf.diagramming/icons/full/obj16/ActivityPartition.gif"
-            genNodes="//@diagram/@topLevelNodes.7 //@diagram/@childNodes.0"/>
-        <entries
-            xsi:type="gmfgen:ToolEntry"
-            title="Start Node"
-            description="Create new Start Node"
-            smallIconPath="/org.eclipse.epf.diagramming/icons/full/obj16/InitialNode.gif"
-            genNodes="//@diagram/@topLevelNodes.3"/>
-        <entries
-            xsi:type="gmfgen:ToolEntry"
-            title="Fork Node"
-            description="Create new Fork Node"
-            smallIconPath="/org.eclipse.epf.diagramming/icons/full/obj16/ForkNode.gif"
-            genNodes="//@diagram/@topLevelNodes.2"/>
-        <entries
-            xsi:type="gmfgen:ToolEntry"
-            title="Merge Node"
-            description="Create new Merge Node"
-            smallIconPath="/org.eclipse.epf.diagramming/icons/full/obj16/MergeNode.gif"
-            genNodes="//@diagram/@topLevelNodes.1"/>
-        <entries
-            xsi:type="gmfgen:ToolEntry"
-            title="Decision Node"
-            description="Create new Decision Node"
-            smallIconPath="/org.eclipse.epf.diagramming/icons/full/obj16/DecisionNode.gif"
-            genNodes="//@diagram/@topLevelNodes.4"/>
-        <entries
-            xsi:type="gmfgen:ToolEntry"
-            title="End Node"
-            description="Create new End Node"
-            smallIconPath="/org.eclipse.epf.diagramming/icons/full/obj16/ActivityFinalNode.gif"
-            genNodes="//@diagram/@topLevelNodes.0"/>
-        <entries
-            xsi:type="gmfgen:ToolEntry"
-            title="Join Node"
-            description="Create new Join Node"
-            smallIconPath="/org.eclipse.epf.diagramming/icons/full/obj16/JoinNode.gif"
-            genNodes="//@diagram/@topLevelNodes.5"/>
-        <entries
-            xsi:type="gmfgen:Separator"/>
-        <entries
-            xsi:type="gmfgen:ToolEntry"
-            title="Activity"
-            description="Create new Activity"
-            smallIconPath="/org.eclipse.epf.diagramming/icons/full/obj16/Activity.gif"
-            genNodes="//@diagram/@topLevelNodes.6"/>
-        <entries
-            xsi:type="gmfgen:ToolEntry"
-            title="Phase"
-            description="Create new Phase"
-            smallIconPath="/org.eclipse.epf.diagramming/icons/full/obj16/Phase.gif"
-            genNodes="//@diagram/@topLevelNodes.9"/>
-        <entries
-            xsi:type="gmfgen:ToolEntry"
-            title="Iteration"
-            description="Create new Iteration"
-            smallIconPath="/org.eclipse.epf.diagramming/icons/full/obj16/Iteration.gif"
-            genNodes="//@diagram/@topLevelNodes.10"/>
-        <entries
-            xsi:type="gmfgen:ToolEntry"
-            title="Task Descriptor"
-            description="Create new Task Descriptor"
-            smallIconPath="/org.eclipse.epf.diagramming/icons/full/obj16/TaskDescriptor.gif"
-            genNodes="//@diagram/@topLevelNodes.8"/>
-        <entries
-            xsi:type="gmfgen:ToolEntry"
-            title="Milestone"
-            description="Create new Milestone"
-            smallIconPath="/org.eclipse.epf.diagramming/icons/full/obj16/Milestone.gif"
-            genNodes="//@diagram/@topLevelNodes.11"/>
-      </groups>
-    </palette>
-  </diagram>
-  <plugin
-      iD="org.eclipse.epf.diagramming"
-      name="EPF Diagramming Plugin"
-      provider="IBM Rational"
-      activatorClassName="EPFDiagramEditorPlugin"/>
-  <editor
-      className="DiagramEditor"/>
-  <domainGenModel
-      href="../../org.eclipse.uml2.uml/model/UML.genmodel#/"/>
-  <expressionProviders>
-    <providers
-        xsi:type="gmfgen:GenJavaExpressionProvider"
-        expressions="//@diagram/@topLevelNodes.6/@modelFacet/@modelElementSelector //@diagram/@topLevelNodes.6/@modelFacet/@modelElementInitializer/@initializers.0 //@diagram/@topLevelNodes.8/@modelFacet/@modelElementSelector //@diagram/@topLevelNodes.8/@modelFacet/@modelElementInitializer/@initializers.0 //@diagram/@topLevelNodes.9/@modelFacet/@modelElementSelector //@diagram/@topLevelNodes.9/@modelFacet/@modelElementInitializer/@initializers.0 //@diagram/@topLevelNodes.10/@modelFacet/@modelElementSelector //@diagram/@topLevelNodes.10/@modelFacet/@modelElementInitializer/@initializers.0 //@diagram/@topLevelNodes.11/@modelFacet/@modelElementSelector //@diagram/@topLevelNodes.11/@modelFacet/@modelElementInitializer/@initializers.0"/>
-  </expressionProviders>
-</gmfgen:GenEditorGenerator>
diff --git a/deprecated_plugins/org.eclipse.epf.diagramming/model/epfdiagram.gmfgraph b/deprecated_plugins/org.eclipse.epf.diagramming/model/epfdiagram.gmfgraph
deleted file mode 100644
index 3ad6304..0000000
--- a/deprecated_plugins/org.eclipse.epf.diagramming/model/epfdiagram.gmfgraph
+++ /dev/null
@@ -1,322 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<gmfgraph:Canvas xmi:version="2.0"
-    xmlns:xmi="http://www.omg.org/XMI"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xmlns:gmfgraph="http://www.eclipse.org/gmf/2005/GraphicalDefinition" name="uml">
-  <figures
-      name="Default">
-    <figures
-        xsi:type="gmfgraph:Rectangle"
-        referencingElements="StructuredActivityNode"
-        name="StructuredActivityNodeFigure"
-        outline="false">
-      <children
-          xsi:type="gmfgraph:Label"
-          referencingElements="NodeName ActivityNodeName InitialNodeName ForkNodeName DecisionNodeName"
-          name="NodeNameFigure"
-          text="&lt;...>"/>
-    </figures>
-    <figures
-        xsi:type="gmfgraph:Rectangle"
-        referencingElements="ActivityPartition"
-        name="ActivityPartitionFigure">
-      <layoutData
-          xsi:type="gmfgraph:XYLayoutData">
-        <size
-            dx="100"
-            dy="200"/>
-      </layoutData>
-      <layout
-          xsi:type="gmfgraph:XYLayout"/>
-      <children
-          xsi:type="gmfgraph:Label"
-          referencingElements="PartitionName"
-          name="PartitionLabelFigure"/>
-      <foregroundColor
-          xsi:type="gmfgraph:ConstantColor"
-          value="black"/>
-      <backgroundColor
-          xsi:type="gmfgraph:RGBColor"
-          red="255"
-          green="255"
-          blue="255"/>
-      <preferredSize
-          dx="400"
-          dy="800"/>
-      <border
-          xsi:type="gmfgraph:LineBorder"/>
-      <size
-          x="100"
-          y="200"/>
-    </figures>
-    <figures
-        xsi:type="gmfgraph:PolylineConnection"
-        referencingElements="ControlFlow"
-        name="ControlFlowFigure"
-        targetDecoration="OpenArrow">
-      <children
-          xsi:type="gmfgraph:PolylineDecoration"
-          name="OpenArrow">
-        <template
-            x="-1"
-            y="1"/>
-        <template/>
-        <template
-            x="-1"
-            y="-1"/>
-      </children>
-      <children
-          xsi:type="gmfgraph:Label"
-          referencingElements="ControlFlowLabel"
-          name="ControlFlowLabelFigure"
-          text=""/>
-    </figures>
-    <figures
-        xsi:type="gmfgraph:Rectangle"
-        referencingElements="ForkNode JoinNode"
-        name="ForkNodeFigure">
-      <backgroundColor
-          xsi:type="gmfgraph:RGBColor"
-          red="51"
-          green="102"
-          blue="102"/>
-      <preferredSize
-          dx="100"
-          dy="8"/>
-      <size
-          x="100"
-          y="8"/>
-    </figures>
-    <figures
-        xsi:type="gmfgraph:Polygon"
-        name="DecisionDiamondPolygonFigure_old">
-      <children
-          xsi:type="gmfgraph:Label"
-          referencingElements="MergeNodePolygonLabel"
-          name="MergeNodePolygonLabelFigure"
-          text="MergeNode"/>
-      <foregroundColor
-          xsi:type="gmfgraph:RGBColor"
-          green="200"
-          blue="100"/>
-      <backgroundColor
-          xsi:type="gmfgraph:ConstantColor"
-          value="lightGray"/>
-      <border
-          xsi:type="gmfgraph:LineBorder"/>
-      <template
-          x="20"
-          y="60"/>
-      <template
-          x="30"
-          y="60"/>
-      <template
-          x="60"
-          y="30"/>
-      <template
-          x="30"
-          y="20"/>
-    </figures>
-    <figures
-        xsi:type="gmfgraph:CustomFigure"
-        name="DecisionDiamondFigure_old"
-        qualifiedClassName="org.eclipse.draw2d.Layer"
-        bundleName="org.eclipse.draw2d">
-      <layout
-          xsi:type="gmfgraph:StackLayout"/>
-      <children
-          xsi:type="gmfgraph:Polygon"
-          name="DiamondPolygon">
-        <foregroundColor
-            xsi:type="gmfgraph:ConstantColor"
-            value="black"/>
-        <backgroundColor
-            xsi:type="gmfgraph:ConstantColor"
-            value="lightGray"/>
-        <maximumSize
-            dx="80"
-            dy="80"/>
-        <size
-            x="80"
-            y="80"/>
-        <template
-            x="40"/>
-        <template
-            x="80"
-            y="40"/>
-        <template
-            x="40"
-            y="80"/>
-        <template
-            y="40"/>
-      </children>
-      <children
-          xsi:type="gmfgraph:Label"
-          name="DecisionMergeLabel_1"
-          text=""/>
-      <preferredSize
-          dx="80"
-          dy="80"/>
-      <size
-          x="80"
-          y="80"/>
-    </figures>
-    <figures
-        xsi:type="gmfgraph:CustomFigure"
-        referencingElements="ActivityFinalNode"
-        name="EndNodeFigure"
-        qualifiedClassName="org.eclipse.epf.gmf.uml.model.EndNodeFigure"
-        bundleName="org.eclipse.epf.gmf.uml.model">
-      <foregroundColor
-          xsi:type="gmfgraph:ConstantColor"
-          value="darkBlue"/>
-      <backgroundColor
-          xsi:type="gmfgraph:RGBColor"
-          red="45"
-          green="85"
-          blue="130"/>
-      <preferredSize
-          dx="24"
-          dy="24"/>
-      <size
-          x="24"
-          y="24"/>
-    </figures>
-    <figures
-        xsi:type="gmfgraph:CustomFigure"
-        referencingElements="DecisionNode MergeNode"
-        name="DecisionDiamondFigure"
-        qualifiedClassName="org.eclipse.gmf.runtime.diagram.ui.geoshapes.internal.draw2d.figures.GeoShapeDiamondFigure"
-        bundleName="org.eclipse.gmf.runtime.diagram.ui.geoshapes">
-      <children
-          xsi:type="gmfgraph:Label"
-          name="DiamondLabel"/>
-      <foregroundColor
-          xsi:type="gmfgraph:ConstantColor"
-          value="darkBlue"/>
-      <backgroundColor
-          xsi:type="gmfgraph:RGBColor"
-          red="185"
-          green="205"
-          blue="230"/>
-      <preferredSize
-          dx="50"
-          dy="50"/>
-      <size
-          x="50"
-          y="50"/>
-    </figures>
-    <figures
-        xsi:type="gmfgraph:Ellipse"
-        referencingElements="InitialNode"
-        name="InitialNodeFigure">
-      <foregroundColor
-          xsi:type="gmfgraph:ConstantColor"
-          value="darkBlue"/>
-      <backgroundColor
-          xsi:type="gmfgraph:RGBColor"
-          red="45"
-          green="85"
-          blue="130"/>
-      <preferredSize
-          dx="20"
-          dy="20"/>
-      <size
-          x="20"
-          y="20"/>
-    </figures>
-    <figures
-        xsi:type="gmfgraph:Label"
-        referencingElements="GenericLabel"
-        name="GenericLabelFigure"/>
-    <figures
-        xsi:type="gmfgraph:CustomFigure"
-        referencingElements="PartitionCampartment"
-        name="ResizeableCompartmentFigureEx"
-        qualifiedClassName="org.eclipse.gmf.runtime.diagram.ui.figures.ResizableCompartmentFigure"
-        bundleName="org.eclipse.gmf.runtime.diagram.ui.figures"/>
-    <figures
-        xsi:type="gmfgraph:Rectangle"
-        referencingElements="ActivityParameterNode"
-        name="ActivityParameterNodeFigure"
-        outline="false">
-      <children
-          xsi:type="gmfgraph:Label"
-          referencingElements="ActivityParameterNodeName"
-          name="ActivityParameterNodeNameLabel"/>
-    </figures>
-  </figures>
-  <nodes
-      name="StructuredActivityNode"
-      figure="StructuredActivityNodeFigure"/>
-  <nodes
-      name="ActivityPartition"
-      figure="ActivityPartitionFigure"/>
-  <nodes
-      name="InitialNode"
-      figure="InitialNodeFigure"/>
-  <nodes
-      name="ForkNode"
-      figure="ForkNodeFigure"
-      resizeConstraint="EAST_WEST"/>
-  <nodes
-      name="MergeNode"
-      figure="DecisionDiamondFigure"/>
-  <nodes
-      name="DecisionNode"
-      figure="DecisionDiamondFigure"/>
-  <nodes
-      name="ActivityFinalNode"
-      figure="EndNodeFigure"/>
-  <nodes
-      name="JoinNode"
-      figure="ForkNodeFigure"
-      resizeConstraint="EAST_WEST"/>
-  <nodes
-      name="ActivityParameterNode"
-      figure="ActivityParameterNodeFigure"/>
-  <connections
-      name="ControlFlow"
-      figure="ControlFlowFigure"/>
-  <compartments
-      name="PartitionCampartment"
-      figure="ResizeableCompartmentFigureEx"/>
-  <labels
-      name="NodeName"
-      figure="NodeNameFigure"/>
-  <labels
-      name="PartitionName"
-      figure="PartitionLabelFigure"/>
-  <labels
-      name="ControlFlowLabel"
-      figure="ControlFlowLabelFigure"
-      resizeConstraint="EAST_WEST"/>
-  <labels
-      name="MergeNodePolygonLabel"
-      figure="MergeNodePolygonLabelFigure"/>
-  <labels
-      name="GenericLabel"
-      figure="GenericLabelFigure"
-      resizeConstraint="EAST_WEST"
-      elementIcon="false"/>
-  <labels
-      name="ActivityNodeName"
-      figure="NodeNameFigure"
-      elementIcon="false"/>
-  <labels
-      name="InitialNodeName"
-      figure="NodeNameFigure"
-      elementIcon="false"/>
-  <labels
-      name="ForkNodeName"
-      figure="NodeNameFigure"
-      elementIcon="false"/>
-  <labels
-      name="DecisionNodeName"
-      figure="NodeNameFigure"
-      elementIcon="false"/>
-  <labels
-      name="ActivityParameterNodeName"
-      figure="ActivityParameterNodeNameLabel"
-      elementIcon="false"/>
-</gmfgraph:Canvas>
diff --git a/deprecated_plugins/org.eclipse.epf.diagramming/model/epfdiagram.gmfmap b/deprecated_plugins/org.eclipse.epf.diagramming/model/epfdiagram.gmfmap
deleted file mode 100644
index 4ff8e3b..0000000
--- a/deprecated_plugins/org.eclipse.epf.diagramming/model/epfdiagram.gmfmap
+++ /dev/null
@@ -1,343 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<gmfmap:Mapping xmi:version="2.0"
-    xmlns:xmi="http://www.omg.org/XMI"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore"
-    xmlns:gmfmap="http://www.eclipse.org/gmf/2005/mappings"
-    xmlns:gmftool="http://www.eclipse.org/gmf/2005/ToolDefinition">
-  <nodes>
-    <containmentFeature
-        href="../../org.eclipse.uml2.uml/model/UML.ecore#//Activity/node"/>
-    <ownedChild>
-      <domainMetaElement
-          href="../../org.eclipse.uml2.uml/model/UML.ecore#//ActivityFinalNode"/>
-      <labelMappings
-          viewPattern=""
-          editPattern="">
-        <diagramLabel
-            href="epfdiagram.gmfgraph#GenericLabel"/>
-        <features
-            href="../../org.eclipse.uml2.uml/model/UML.ecore#//NamedElement/name"/>
-      </labelMappings>
-      <tool
-          xsi:type="gmftool:CreationTool"
-          href="epfdiagram.gmftool#//@palette/@tools.1/@tools.5"/>
-      <diagramNode
-          href="epfdiagram.gmfgraph#ActivityFinalNode"/>
-    </ownedChild>
-  </nodes>
-  <nodes>
-    <containmentFeature
-        href="../../org.eclipse.uml2.uml/model/UML.ecore#//Activity/node"/>
-    <ownedChild>
-      <domainMetaElement
-          href="../../org.eclipse.uml2.uml/model/UML.ecore#//MergeNode"/>
-      <labelMappings
-          viewPattern="">
-        <diagramLabel
-            href="epfdiagram.gmfgraph#DecisionNodeName"/>
-        <features
-            href="../../org.eclipse.uml2.uml/model/UML.ecore#//NamedElement/name"/>
-      </labelMappings>
-      <tool
-          xsi:type="gmftool:CreationTool"
-          href="epfdiagram.gmftool#//@palette/@tools.1/@tools.3"/>
-      <diagramNode
-          href="epfdiagram.gmfgraph#MergeNode"/>
-    </ownedChild>
-  </nodes>
-  <nodes>
-    <containmentFeature
-        href="../../org.eclipse.uml2.uml/model/UML.ecore#//Activity/node"/>
-    <ownedChild>
-      <domainMetaElement
-          href="../../org.eclipse.uml2.uml/model/UML.ecore#//ForkNode"/>
-      <tool
-          xsi:type="gmftool:CreationTool"
-          href="epfdiagram.gmftool#//@palette/@tools.1/@tools.2"/>
-      <diagramNode
-          href="epfdiagram.gmfgraph#ForkNode"/>
-    </ownedChild>
-  </nodes>
-  <nodes>
-    <containmentFeature
-        href="../../org.eclipse.uml2.uml/model/UML.ecore#//Activity/node"/>
-    <ownedChild>
-      <domainMetaElement
-          href="../../org.eclipse.uml2.uml/model/UML.ecore#//InitialNode"/>
-      <labelMappings
-          viewPattern=""
-          editPattern="">
-        <diagramLabel
-            href="epfdiagram.gmfgraph#GenericLabel"/>
-        <features
-            href="../../org.eclipse.uml2.uml/model/UML.ecore#//NamedElement/name"/>
-      </labelMappings>
-      <tool
-          xsi:type="gmftool:CreationTool"
-          href="epfdiagram.gmftool#//@palette/@tools.1/@tools.1"/>
-      <diagramNode
-          href="epfdiagram.gmfgraph#InitialNode"/>
-    </ownedChild>
-  </nodes>
-  <nodes>
-    <containmentFeature
-        href="../../org.eclipse.uml2.uml/model/UML.ecore#//Activity/node"/>
-    <ownedChild>
-      <domainMetaElement
-          href="../../org.eclipse.uml2.uml/model/UML.ecore#//DecisionNode"/>
-      <labelMappings
-          editPattern="">
-        <diagramLabel
-            href="epfdiagram.gmfgraph#DecisionNodeName"/>
-        <features
-            href="../../org.eclipse.uml2.uml/model/UML.ecore#//NamedElement/name"/>
-      </labelMappings>
-      <tool
-          xsi:type="gmftool:CreationTool"
-          href="epfdiagram.gmftool#//@palette/@tools.1/@tools.4"/>
-      <diagramNode
-          href="epfdiagram.gmfgraph#DecisionNode"/>
-    </ownedChild>
-  </nodes>
-  <nodes>
-    <containmentFeature
-        href="../../org.eclipse.uml2.uml/model/UML.ecore#//Activity/node"/>
-    <ownedChild>
-      <domainMetaElement
-          href="../../org.eclipse.uml2.uml/model/UML.ecore#//JoinNode"/>
-      <tool
-          xsi:type="gmftool:CreationTool"
-          href="epfdiagram.gmftool#//@palette/@tools.1/@tools.6"/>
-      <diagramNode
-          href="epfdiagram.gmfgraph#JoinNode"/>
-    </ownedChild>
-  </nodes>
-  <nodes>
-    <containmentFeature
-        href="../../org.eclipse.uml2.uml/model/UML.ecore#//Activity/node"/>
-    <ownedChild>
-      <domainMetaElement
-          href="../../org.eclipse.uml2.uml/model/UML.ecore#//StructuredActivityNode"/>
-      <domainSpecialization
-          body="getUmaType_Activity"
-          language="java"/>
-      <domainInitializer
-          xsi:type="gmfmap:FeatureSeqInitializer">
-        <initializers
-            body="createUmaType_Activity&#xD;&#xA;"
-            language="java">
-          <feature
-              xsi:type="ecore:EReference"
-              href="../../../plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EModelElement/eAnnotations"/>
-        </initializers>
-      </domainInitializer>
-      <labelMappings>
-        <diagramLabel
-            href="epfdiagram.gmfgraph#ActivityNodeName"/>
-        <features
-            href="../../org.eclipse.uml2.uml/model/UML.ecore#//NamedElement/name"/>
-      </labelMappings>
-      <tool
-          xsi:type="gmftool:CreationTool"
-          href="epfdiagram.gmftool#//@palette/@tools.1/@tools.8"/>
-      <diagramNode
-          href="epfdiagram.gmfgraph#StructuredActivityNode"/>
-    </ownedChild>
-  </nodes>
-  <nodes>
-    <containmentFeature
-        href="../../org.eclipse.uml2.uml/model/UML.ecore#//Activity/group"/>
-    <ownedChild>
-      <domainMetaElement
-          href="../../org.eclipse.uml2.uml/model/UML.ecore#//ActivityPartition"/>
-      <labelMappings
-          viewPattern=""
-          editPattern="">
-        <diagramLabel
-            href="epfdiagram.gmfgraph#PartitionName"/>
-        <features
-            href="../../org.eclipse.uml2.uml/model/UML.ecore#//NamedElement/name"/>
-      </labelMappings>
-      <tool
-          xsi:type="gmftool:CreationTool"
-          href="epfdiagram.gmftool#//@palette/@tools.1/@tools.0"/>
-      <diagramNode
-          href="epfdiagram.gmfgraph#ActivityPartition"/>
-      <children
-          compartment="//@nodes.7/@ownedChild/@compartments.0"
-          referencedChild="//@nodes.7/@ownedChild">
-        <containmentFeature
-            href="../../org.eclipse.uml2.uml/model/UML.ecore#//ActivityPartition/subpartition"/>
-      </children>
-      <compartments
-          children="//@nodes.7/@ownedChild/@children.0">
-        <compartment
-            href="epfdiagram.gmfgraph#PartitionCampartment"/>
-      </compartments>
-    </ownedChild>
-  </nodes>
-  <nodes>
-    <containmentFeature
-        href="../../org.eclipse.uml2.uml/model/UML.ecore#//Activity/node"/>
-    <ownedChild>
-      <domainMetaElement
-          href="../../org.eclipse.uml2.uml/model/UML.ecore#//ActivityParameterNode"/>
-      <domainSpecialization
-          body="getUmaType_TaskDescriptor"
-          language="java"/>
-      <domainInitializer
-          xsi:type="gmfmap:FeatureSeqInitializer">
-        <initializers
-            body="createUmaType_TaskDescriptor"
-            language="java">
-          <feature
-              xsi:type="ecore:EReference"
-              href="../../../plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EModelElement/eAnnotations"/>
-        </initializers>
-      </domainInitializer>
-      <labelMappings>
-        <diagramLabel
-            href="epfdiagram.gmfgraph#ActivityParameterNodeName"/>
-        <features
-            href="../../org.eclipse.uml2.uml/model/UML.ecore#//NamedElement/name"/>
-      </labelMappings>
-      <tool
-          xsi:type="gmftool:CreationTool"
-          href="epfdiagram.gmftool#//@palette/@tools.1/@tools.11"/>
-      <diagramNode
-          href="epfdiagram.gmfgraph#ActivityParameterNode"/>
-    </ownedChild>
-  </nodes>
-  <nodes>
-    <containmentFeature
-        href="../../org.eclipse.uml2.uml/model/UML.ecore#//Activity/node"/>
-    <ownedChild>
-      <domainMetaElement
-          href="../../org.eclipse.uml2.uml/model/UML.ecore#//StructuredActivityNode"/>
-      <domainSpecialization
-          body="getUmaType_Phase"
-          language="java"/>
-      <domainInitializer
-          xsi:type="gmfmap:FeatureSeqInitializer">
-        <initializers
-            body="createUmaType_Phase"
-            language="java">
-          <feature
-              xsi:type="ecore:EReference"
-              href="../../../plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EModelElement/eAnnotations"/>
-        </initializers>
-      </domainInitializer>
-      <labelMappings>
-        <diagramLabel
-            href="epfdiagram.gmfgraph#ActivityNodeName"/>
-        <features
-            href="../../org.eclipse.uml2.uml/model/UML.ecore#//NamedElement/name"/>
-      </labelMappings>
-      <tool
-          xsi:type="gmftool:CreationTool"
-          href="epfdiagram.gmftool#//@palette/@tools.1/@tools.9"/>
-      <diagramNode
-          href="epfdiagram.gmfgraph#StructuredActivityNode"/>
-    </ownedChild>
-  </nodes>
-  <nodes>
-    <containmentFeature
-        href="../../org.eclipse.uml2.uml/model/UML.ecore#//Activity/node"/>
-    <ownedChild>
-      <domainMetaElement
-          href="../../org.eclipse.uml2.uml/model/UML.ecore#//StructuredActivityNode"/>
-      <domainSpecialization
-          body="getUmaType_Iteration"
-          language="java"/>
-      <domainInitializer
-          xsi:type="gmfmap:FeatureSeqInitializer">
-        <initializers
-            body="createUmaType_Iteration"
-            language="java">
-          <feature
-              xsi:type="ecore:EReference"
-              href="../../../plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EModelElement/eAnnotations"/>
-        </initializers>
-      </domainInitializer>
-      <labelMappings>
-        <diagramLabel
-            href="epfdiagram.gmfgraph#ActivityNodeName"/>
-        <features
-            href="../../org.eclipse.uml2.uml/model/UML.ecore#//NamedElement/name"/>
-      </labelMappings>
-      <tool
-          xsi:type="gmftool:CreationTool"
-          href="epfdiagram.gmftool#//@palette/@tools.1/@tools.10"/>
-      <diagramNode
-          href="epfdiagram.gmfgraph#StructuredActivityNode"/>
-    </ownedChild>
-  </nodes>
-  <nodes>
-    <containmentFeature
-        href="../../org.eclipse.uml2.uml/model/UML.ecore#//Activity/node"/>
-    <ownedChild>
-      <domainMetaElement
-          href="../../org.eclipse.uml2.uml/model/UML.ecore#//ActivityParameterNode"/>
-      <domainSpecialization
-          body="getUmaType_Milestone"
-          language="java"/>
-      <domainInitializer
-          xsi:type="gmfmap:FeatureSeqInitializer">
-        <initializers
-            body="createUmaType_Milestone"
-            language="java">
-          <feature
-              xsi:type="ecore:EReference"
-              href="../../../plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EModelElement/eAnnotations"/>
-        </initializers>
-      </domainInitializer>
-      <labelMappings>
-        <diagramLabel
-            href="epfdiagram.gmfgraph#ActivityParameterNodeName"/>
-        <features
-            href="../../org.eclipse.uml2.uml/model/UML.ecore#//NamedElement/name"/>
-      </labelMappings>
-      <tool
-          xsi:type="gmftool:CreationTool"
-          href="epfdiagram.gmftool#//@palette/@tools.1/@tools.12"/>
-      <diagramNode
-          href="epfdiagram.gmfgraph#ActivityParameterNode"/>
-    </ownedChild>
-  </nodes>
-  <links>
-    <domainMetaElement
-        href="../../org.eclipse.uml2.uml/model/UML.ecore#//ControlFlow"/>
-    <labelMappings
-        viewPattern=""
-        editPattern="">
-      <diagramLabel
-          href="epfdiagram.gmfgraph#ControlFlowLabel"/>
-      <features
-          href="../../org.eclipse.uml2.uml/model/UML.ecore#//NamedElement/name"/>
-    </labelMappings>
-    <containmentFeature
-        href="../../org.eclipse.uml2.uml/model/UML.ecore#//StructuredActivityNode/edge"/>
-    <tool
-        xsi:type="gmftool:CreationTool"
-        href="epfdiagram.gmftool#//@palette/@tools.0/@tools.0"/>
-    <diagramLink
-        href="epfdiagram.gmfgraph#ControlFlow"/>
-    <sourceMetaFeature
-        xsi:type="ecore:EReference"
-        href="../../org.eclipse.uml2.uml/model/UML.ecore#//ActivityEdge/source"/>
-    <linkMetaFeature
-        xsi:type="ecore:EReference"
-        href="../../org.eclipse.uml2.uml/model/UML.ecore#//ActivityEdge/target"/>
-  </links>
-  <diagram>
-    <diagramCanvas
-        href="epfdiagram.gmfgraph#uml"/>
-    <domainModel
-        href="../../org.eclipse.uml2.uml/model/UML.ecore#/"/>
-    <domainMetaElement
-        href="../../org.eclipse.uml2.uml/model/UML.ecore#//Activity"/>
-    <palette
-        href="epfdiagram.gmftool#//@palette"/>
-  </diagram>
-</gmfmap:Mapping>
diff --git a/deprecated_plugins/org.eclipse.epf.diagramming/model/epfdiagram.gmftool b/deprecated_plugins/org.eclipse.epf.diagramming/model/epfdiagram.gmftool
deleted file mode 100644
index 39e4696..0000000
--- a/deprecated_plugins/org.eclipse.epf.diagramming/model/epfdiagram.gmftool
+++ /dev/null
@@ -1,166 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<gmftool:ToolRegistry xmi:version="2.0"
-    xmlns:xmi="http://www.omg.org/XMI"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xmlns:gmftool="http://www.eclipse.org/gmf/2005/ToolDefinition">
-  <palette>
-    <tools
-        xsi:type="gmftool:ToolGroup"
-        title="Flows"
-        description="Creation tool for flows"
-        collapsible="true">
-      <tools
-          xsi:type="gmftool:CreationTool"
-          title="Control Flow"
-          description="Create new Control Flow">
-        <smallIcon
-            xsi:type="gmftool:BundleImage"
-            path="icons/full/obj16/ControlFlow.gif"
-            bundle="org.eclipse.epf.diagramming"/>
-        <largeIcon
-            xsi:type="gmftool:DefaultImage"/>
-      </tools>
-    </tools>
-    <tools
-        xsi:type="gmftool:ToolGroup"
-        title="Nodes"
-        description="Creation tool group for nodes"
-        collapsible="true"
-        active="//@palette/@tools.1">
-      <tools
-          xsi:type="gmftool:CreationTool"
-          title="Activity Partition"
-          description="Create new Activity Partition">
-        <smallIcon
-            xsi:type="gmftool:BundleImage"
-            path="icons/full/obj16/ActivityPartition.gif"
-            bundle="org.eclipse.epf.diagramming"/>
-        <largeIcon
-            xsi:type="gmftool:DefaultImage"/>
-      </tools>
-      <tools
-          xsi:type="gmftool:CreationTool"
-          title="Start Node"
-          description="Create new Start Node">
-        <smallIcon
-            xsi:type="gmftool:BundleImage"
-            path="icons/full/obj16/InitialNode.gif"
-            bundle="org.eclipse.epf.diagramming"/>
-        <largeIcon
-            xsi:type="gmftool:DefaultImage"/>
-      </tools>
-      <tools
-          xsi:type="gmftool:CreationTool"
-          title="Fork Node"
-          description="Create new Fork Node">
-        <smallIcon
-            xsi:type="gmftool:BundleImage"
-            path="icons/full/obj16/ForkNode.gif"
-            bundle="org.eclipse.epf.diagramming"/>
-        <largeIcon
-            xsi:type="gmftool:DefaultImage"/>
-      </tools>
-      <tools
-          xsi:type="gmftool:CreationTool"
-          title="Merge Node"
-          description="Create new Merge Node">
-        <smallIcon
-            xsi:type="gmftool:BundleImage"
-            path="icons/full/obj16/MergeNode.gif"
-            bundle="org.eclipse.epf.diagramming"/>
-        <largeIcon
-            xsi:type="gmftool:DefaultImage"/>
-      </tools>
-      <tools
-          xsi:type="gmftool:CreationTool"
-          title="Decision Node"
-          description="Create new Decision Node">
-        <smallIcon
-            xsi:type="gmftool:BundleImage"
-            path="icons/full/obj16/DecisionNode.gif"
-            bundle="org.eclipse.epf.diagramming"/>
-        <largeIcon
-            xsi:type="gmftool:DefaultImage"/>
-      </tools>
-      <tools
-          xsi:type="gmftool:CreationTool"
-          title="End Node"
-          description="Create new End Node">
-        <smallIcon
-            xsi:type="gmftool:BundleImage"
-            path="icons/full/obj16/ActivityFinalNode.gif"
-            bundle="org.eclipse.epf.diagramming"/>
-        <largeIcon
-            xsi:type="gmftool:DefaultImage"/>
-      </tools>
-      <tools
-          xsi:type="gmftool:CreationTool"
-          title="Join Node"
-          description="Create new Join Node">
-        <smallIcon
-            xsi:type="gmftool:BundleImage"
-            path="icons/full/obj16/JoinNode.gif"
-            bundle="org.eclipse.epf.diagramming"/>
-        <largeIcon
-            xsi:type="gmftool:DefaultImage"/>
-      </tools>
-      <tools
-          xsi:type="gmftool:PaletteSeparator"/>
-      <tools
-          xsi:type="gmftool:CreationTool"
-          title="Activity"
-          description="Create new Activity">
-        <smallIcon
-            xsi:type="gmftool:BundleImage"
-            path="icons/full/obj16/Activity.gif"
-            bundle="org.eclipse.epf.diagramming"/>
-        <largeIcon
-            xsi:type="gmftool:DefaultImage"/>
-      </tools>
-      <tools
-          xsi:type="gmftool:CreationTool"
-          title="Phase"
-          description="Create new Phase">
-        <smallIcon
-            xsi:type="gmftool:BundleImage"
-            path="icons/full/obj16/Phase.gif"
-            bundle="org.eclipse.epf.diagramming"/>
-        <largeIcon
-            xsi:type="gmftool:DefaultImage"/>
-      </tools>
-      <tools
-          xsi:type="gmftool:CreationTool"
-          title="Iteration"
-          description="Create new Iteration">
-        <smallIcon
-            xsi:type="gmftool:BundleImage"
-            path="icons/full/obj16/Iteration.gif"
-            bundle="org.eclipse.epf.diagramming"/>
-        <largeIcon
-            xsi:type="gmftool:BundleImage"/>
-      </tools>
-      <tools
-          xsi:type="gmftool:CreationTool"
-          title="Task Descriptor"
-          description="Create new Task Descriptor">
-        <smallIcon
-            xsi:type="gmftool:BundleImage"
-            path="icons/full/obj16/TaskDescriptor.gif"
-            bundle="org.eclipse.epf.diagramming"/>
-        <largeIcon
-            xsi:type="gmftool:DefaultImage"/>
-      </tools>
-      <tools
-          xsi:type="gmftool:CreationTool"
-          title="Milestone"
-          description="Create new Milestone">
-        <smallIcon
-            xsi:type="gmftool:BundleImage"
-            path="icons/full/obj16/Milestone.gif"
-            bundle="org.eclipse.epf.diagramming"/>
-        <largeIcon
-            xsi:type="gmftool:DefaultImage"/>
-      </tools>
-    </tools>
-  </palette>
-</gmftool:ToolRegistry>
diff --git a/deprecated_plugins/org.eclipse.epf.diagramming/plugin.properties b/deprecated_plugins/org.eclipse.epf.diagramming/plugin.properties
deleted file mode 100644
index ff5a40b..0000000
--- a/deprecated_plugins/org.eclipse.epf.diagramming/plugin.properties
+++ /dev/null
@@ -1,19 +0,0 @@
-#------------------------------------------------------------------------------
-# Copyright (c) 2005, 2007 IBM Corporation 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:
-# IBM Corporation - initial implementation
-#------------------------------------------------------------------------------
-pluginName=EPF Diagramming Plugin
-providerName=Eclipse.org
-
-#Needs Translation
-DeleteDiagram_text=Delete Diagram
-refreshFromBaseActivity_text=Refresh from Base Activity
-refresh_text=Refresh
-open_add_text=Open Activity Detail Diagram
-delete_text=Delete
\ No newline at end of file
diff --git a/deprecated_plugins/org.eclipse.epf.diagramming/plugin.xml b/deprecated_plugins/org.eclipse.epf.diagramming/plugin.xml
deleted file mode 100644
index 9cf7286..0000000
--- a/deprecated_plugins/org.eclipse.epf.diagramming/plugin.xml
+++ /dev/null
@@ -1,599 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-
-<!--
- Copyright (c) 2005, 2006 IBM Corporation 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:
- IBM Corporation - initial implementation
-
--->
-<plugin>
-
-   <extension point="org.eclipse.core.runtime.preferences">
-      <initializer class="org.eclipse.epf.diagramming.part.UMLDiagramPreferenceInitializer"/>
-   </extension>
-
-  <extension point="org.eclipse.team.core.fileTypes">
-      <fileTypes
-         type="text"
-         extension="xmi">
-      </fileTypes>
-  </extension>
-
-   <extension point="org.eclipse.emf.ecore.extension_parser">
-      <parser
-         type="xmi"
-         class="org.eclipse.gmf.runtime.emf.core.resources.GMFResourceFactory">
-      </parser>
-   </extension>
-
-   <extension point="org.eclipse.ui.editors">
-     <editor
-        id="org.eclipse.epf.diagramming.part.DiagramEditorID"
-        name="Activity Diagram Editor"
-        icon="icons/obj16/UMLDiagramFile.gif"
-        class="org.eclipse.epf.diagramming.part.DiagramEditor"
-        matchingStrategy="org.eclipse.epf.diagramming.part.UMLMatchingStrategy"
-        contributorClass="org.eclipse.epf.diagramming.part.UMLDiagramActionBarContributor">
-     </editor>
-   </extension>
-
-  <!-- <extension point="org.eclipse.ui.newWizards">
-  	  <wizard
-  	     name="Activity Diagram"
-  	     icon="icons/obj16/UMLDiagramFile.gif"
-  	     category="org.eclipse.ui.Examples"
-  	     class="org.eclipse.epf.diagramming.part.UMLCreationWizard"
-  	     id="org.eclipse.epf.diagramming.part.UMLCreationWizardID">
-  	  	 <description>
-  	  		Creates Activity diagram.
-  	  	 </description>  
-      </wizard>
-   </extension> -->
-
-   <extension point="org.eclipse.ui.popupMenus">
-     	<!-- <objectContribution
-            id="org.eclipse.epf.diagramming.ui.objectContribution.IFile1"
-            nameFilter="*.uml"
-            objectClass="org.eclipse.core.resources.IFile">
-         <action
-               label="Initialize xmi diagram file"
-               class="org.eclipse.epf.diagramming.part.UMLInitDiagramFileAction"
-               menubarPath="additions"
-               enablesFor="1"
-               id="org.eclipse.epf.diagramming.part.UMLInitDiagramFileActionID">
-         </action>
-      </objectContribution>  
-      <objectContribution
-            adaptable="false"
-            id="org.eclipse.epf.diagramming.ui.objectContribution.ActivityEditPart2"
-            objectClass="org.eclipse.epf.diagramming.edit.parts.ActivityEditPart">
-         <action
-               class="org.eclipse.epf.diagramming.part.UMLLoadResourceAction"
-               enablesFor="1"
-               id="org.eclipse.epf.diagramming.part.UMLLoadResourceActionID"
-               label="Load Resource..."
-               menubarPath="additions">
-         </action>
-      </objectContribution> 
-	 <objectContribution
-            adaptable="true"
-            id="org.eclipse.epf.diagramming.DeleteDiagram"
-            objectClass="org.eclipse.epf.diagramming.edit.parts.ActivityEditPart">
-         <action
-               class="org.eclipse.epf.diagram.core.actions.DeleteDiagramAction"
-               enablesFor="1"
-               id="org.eclipse.epf.diagram.core.actions.DeleteDiagramAction"
-               label="%DeleteDiagram_text"
-               menubarPath="additions"
-               style="push"
-               tooltip="%DeleteDiagram_text"/>
-      </objectContribution> 
-      <objectContribution
-            adaptable="false"
-            id="org.eclipse.epf.diagramming.RefreshFromBaseAction"
-            objectClass="org.eclipse.epf.diagramming.edit.parts.ActivityEditPart">
-         <action
-               class="org.eclipse.epf.diagram.core.actions.RefreshFromBaseAction"
-               enablesFor="1"
-               id="org.eclipse.epf.diagram.core.actions.RefreshFromBaseAction"
-               label="%refreshFromBaseActivity_text"
-               menubarPath="additions"
-               style="push"
-               tooltip="%refreshFromBaseActivity_text"/>
-      </objectContribution>
-      <objectContribution
-            adaptable="false"
-            id="org.eclipse.epf.diagramming.RefreshAction"
-            objectClass="org.eclipse.epf.diagramming.edit.parts.ActivityEditPart">
-         <action
-               class="org.eclipse.epf.diagram.core.actions.RefreshAction"
-               enablesFor="1"
-               id="org.eclipse.epf.diagram.core.actions.RefreshAction"
-               label="%refresh_text"
-               menubarPath="additions"
-               style="push"
-               tooltip="%refresh_text"/>
-      </objectContribution>
-      <objectContribution
-            adaptable="false"
-            id="org.eclipse.epf.diagramming.OpenADD"
-            objectClass="org.eclipse.epf.diagramming.edit.parts.StructuredActivityNodeEditPart">
-         <action
-               class="org.eclipse.epf.diagramming.base.actions.OpenActivityDetailDiagramAction"
-               enablesFor="1"
-               id="org.eclipse.epf.diagramming.base.actions.OpenActivityDetailDiagramAction"
-               label="%open_add_text"
-               menubarPath="additions"
-               style="push"
-               tooltip="%open_add_text"/>
-      </objectContribution>
-      <objectContribution
-            adaptable="false"
-            id="org.eclipse.epf.diagramming.OpenADD2"
-            objectClass="org.eclipse.epf.diagramming.edit.parts.StructuredActivityNode2EditPart">
-         <action
-               class="org.eclipse.epf.diagramming.base.actions.OpenActivityDetailDiagramAction"
-               enablesFor="1"
-               id="org.eclipse.epf.diagramming.base.actions.OpenActivityDetailDiagramAction"
-               label="%open_add_text"
-               menubarPath="additions"
-               style="push"
-               tooltip="%open_add_text"/>
-      </objectContribution>
-      <objectContribution
-            adaptable="false"
-            id="org.eclipse.epf.diagramming.OpenADD3"
-            objectClass="org.eclipse.epf.diagramming.edit.parts.StructuredActivityNode3EditPart">
-         <action
-               class="org.eclipse.epf.diagramming.base.actions.OpenActivityDetailDiagramAction"
-               enablesFor="1"
-               id="org.eclipse.epf.diagramming.base.actions.OpenActivityDetailDiagramAction"
-               label="%open_add_text"
-               menubarPath="additions"
-               style="push"
-               tooltip="%open_add_text"/>
-      </objectContribution>
-      <objectContribution
-            adaptable="true"
-            id="org.eclipse.epf.diagramming.DeleteDiagramElementAction"
-            objectClass="org.eclipse.gmf.runtime.diagram.ui.editparts.ShapeNodeEditPart">
-         <action
-               class="org.eclipse.epf.diagram.core.actions.DeleteDiagramElementAction"
-               enablesFor="*"
-               icon="icons/full/obj16/delete.gif"
-               id="org.eclipse.epf.diagram.core.actions.DeleteDiagramElementAction"
-               label="%delete_text"
-               menubarPath="additions"
-               overrideActionId="deleteFromDiagramAction"
-               style="push"
-               tooltip="%delete_text"/>
-      </objectContribution> -->
-  </extension>
-
-   <extension point="org.eclipse.gmf.runtime.common.ui.services.action.contributionItemProviders">
-      <contributionItemProvider
-            class="org.eclipse.gmf.runtime.diagram.ui.providers.DiagramContributionItemProvider"
-            checkPluginLoaded="false">
-         <Priority name="Low"/>
-         <!--
-         <popupContribution class="org.eclipse.gmf.runtime.diagram.ui.providers.DiagramContextMenuProvider">
-            <popupStructuredContributionCriteria objectClass="org.eclipse.epf.diagramming.edit.parts.ActivityPartition2EditPart"/>
-            <popupPredefinedItem id="deleteFromDiagramAction" remove="true"/>
-         </popupContribution>
-         <popupContribution class="org.eclipse.gmf.runtime.diagram.ui.providers.DiagramContextMenuProvider">
-            <popupStructuredContributionCriteria objectClass="org.eclipse.epf.diagramming.edit.parts.ActivityPartitionNameEditPart"/>
-            <popupPredefinedItem id="deleteFromDiagramAction" remove="true"/>
-         </popupContribution>
-         <popupContribution class="org.eclipse.gmf.runtime.diagram.ui.providers.DiagramContextMenuProvider">
-            <popupStructuredContributionCriteria objectClass="org.eclipse.epf.diagramming.edit.parts.ActivityFinalNodeEditPart"/>
-            <popupPredefinedItem id="deleteFromDiagramAction" remove="true"/>
-         </popupContribution>
-         <popupContribution class="org.eclipse.gmf.runtime.diagram.ui.providers.DiagramContextMenuProvider">
-            <popupStructuredContributionCriteria objectClass="org.eclipse.epf.diagramming.edit.parts.ActivityFinalNodeNameEditPart"/>
-            <popupPredefinedItem id="deleteFromDiagramAction" remove="true"/>
-            <popupPredefinedItem id="deleteFromModelAction" remove="true"/>
-         </popupContribution>
-         <popupContribution class="org.eclipse.gmf.runtime.diagram.ui.providers.DiagramContextMenuProvider">
-            <popupStructuredContributionCriteria objectClass="org.eclipse.epf.diagramming.edit.parts.MergeNodeEditPart"/>
-            <popupPredefinedItem id="deleteFromDiagramAction" remove="true"/>
-         </popupContribution>
-         <popupContribution class="org.eclipse.gmf.runtime.diagram.ui.providers.DiagramContextMenuProvider">
-            <popupStructuredContributionCriteria objectClass="org.eclipse.epf.diagramming.edit.parts.MergeNodeNameEditPart"/>
-            <popupPredefinedItem id="deleteFromDiagramAction" remove="true"/>
-         </popupContribution>
-         <popupContribution class="org.eclipse.gmf.runtime.diagram.ui.providers.DiagramContextMenuProvider">
-            <popupStructuredContributionCriteria objectClass="org.eclipse.epf.diagramming.edit.parts.ForkNodeEditPart"/>
-            <popupPredefinedItem id="deleteFromDiagramAction" remove="true"/>
-         </popupContribution>
-         <popupContribution class="org.eclipse.gmf.runtime.diagram.ui.providers.DiagramContextMenuProvider">
-            <popupStructuredContributionCriteria objectClass="org.eclipse.epf.diagramming.edit.parts.InitialNodeEditPart"/>
-            <popupPredefinedItem id="deleteFromDiagramAction" remove="true"/>
-         </popupContribution>
-         <popupContribution class="org.eclipse.gmf.runtime.diagram.ui.providers.DiagramContextMenuProvider">
-            <popupStructuredContributionCriteria objectClass="org.eclipse.epf.diagramming.edit.parts.InitialNodeNameEditPart"/>
-            <popupPredefinedItem id="deleteFromDiagramAction" remove="true"/>
-            <popupPredefinedItem id="deleteFromModelAction" remove="true"/>
-         </popupContribution>
-         <popupContribution class="org.eclipse.gmf.runtime.diagram.ui.providers.DiagramContextMenuProvider">
-            <popupStructuredContributionCriteria objectClass="org.eclipse.epf.diagramming.edit.parts.DecisionNodeEditPart"/>
-            <popupPredefinedItem id="deleteFromDiagramAction" remove="true"/>
-         </popupContribution>
-         <popupContribution class="org.eclipse.gmf.runtime.diagram.ui.providers.DiagramContextMenuProvider">
-            <popupStructuredContributionCriteria objectClass="org.eclipse.epf.diagramming.edit.parts.DecisionNodeNameEditPart"/>
-            <popupPredefinedItem id="deleteFromDiagramAction" remove="true"/>
-         </popupContribution>
-         <popupContribution class="org.eclipse.gmf.runtime.diagram.ui.providers.DiagramContextMenuProvider">
-            <popupStructuredContributionCriteria objectClass="org.eclipse.epf.diagramming.edit.parts.JoinNodeEditPart"/>
-            <popupPredefinedItem id="deleteFromDiagramAction" remove="true"/>
-         </popupContribution>
-         <popupContribution class="org.eclipse.gmf.runtime.diagram.ui.providers.DiagramContextMenuProvider">
-            <popupStructuredContributionCriteria objectClass="org.eclipse.epf.diagramming.edit.parts.StructuredActivityNodeEditPart"/>
-            <popupPredefinedItem id="deleteFromDiagramAction" remove="true"/>
-         </popupContribution>
-         <popupContribution class="org.eclipse.gmf.runtime.diagram.ui.providers.DiagramContextMenuProvider">
-            <popupStructuredContributionCriteria objectClass="org.eclipse.epf.diagramming.edit.parts.StructuredActivityNodeNameEditPart"/>
-            <popupPredefinedItem id="deleteFromDiagramAction" remove="true"/>
-         </popupContribution>
-         <popupContribution class="org.eclipse.gmf.runtime.diagram.ui.providers.DiagramContextMenuProvider">
-            <popupStructuredContributionCriteria objectClass="org.eclipse.epf.diagramming.edit.parts.ActivityPartitionEditPart"/>
-            <popupPredefinedItem id="deleteFromDiagramAction" remove="true"/>
-         </popupContribution>
-         <popupContribution class="org.eclipse.gmf.runtime.diagram.ui.providers.DiagramContextMenuProvider">
-            <popupStructuredContributionCriteria objectClass="org.eclipse.epf.diagramming.edit.parts.ActivityPartitionName2EditPart"/>
-            <popupPredefinedItem id="deleteFromDiagramAction" remove="true"/>
-         </popupContribution>
-         <popupContribution class="org.eclipse.gmf.runtime.diagram.ui.providers.DiagramContextMenuProvider">
-            <popupStructuredContributionCriteria objectClass="org.eclipse.epf.diagramming.edit.parts.ActivityParameterNodeEditPart"/>
-            <popupPredefinedItem id="deleteFromDiagramAction" remove="true"/>
-         </popupContribution>
-         <popupContribution class="org.eclipse.gmf.runtime.diagram.ui.providers.DiagramContextMenuProvider">
-            <popupStructuredContributionCriteria objectClass="org.eclipse.epf.diagramming.edit.parts.ActivityParameterNodeNameEditPart"/>
-            <popupPredefinedItem id="deleteFromDiagramAction" remove="true"/>
-         </popupContribution>
-         <popupContribution class="org.eclipse.gmf.runtime.diagram.ui.providers.DiagramContextMenuProvider">
-            <popupStructuredContributionCriteria objectClass="org.eclipse.epf.diagramming.edit.parts.StructuredActivityNode2EditPart"/>
-            <popupPredefinedItem id="deleteFromDiagramAction" remove="true"/>
-         </popupContribution>
-         <popupContribution class="org.eclipse.gmf.runtime.diagram.ui.providers.DiagramContextMenuProvider">
-            <popupStructuredContributionCriteria objectClass="org.eclipse.epf.diagramming.edit.parts.StructuredActivityNodeName2EditPart"/>
-            <popupPredefinedItem id="deleteFromDiagramAction" remove="true"/>
-         </popupContribution>
-         <popupContribution class="org.eclipse.gmf.runtime.diagram.ui.providers.DiagramContextMenuProvider">
-            <popupStructuredContributionCriteria objectClass="org.eclipse.epf.diagramming.edit.parts.StructuredActivityNode3EditPart"/>
-            <popupPredefinedItem id="deleteFromDiagramAction" remove="true"/>
-         </popupContribution>
-         <popupContribution class="org.eclipse.gmf.runtime.diagram.ui.providers.DiagramContextMenuProvider">
-            <popupStructuredContributionCriteria objectClass="org.eclipse.epf.diagramming.edit.parts.StructuredActivityNodeName3EditPart"/>
-            <popupPredefinedItem id="deleteFromDiagramAction" remove="true"/>
-         </popupContribution>
-         <popupContribution class="org.eclipse.gmf.runtime.diagram.ui.providers.DiagramContextMenuProvider">
-            <popupStructuredContributionCriteria objectClass="org.eclipse.epf.diagramming.edit.parts.ActivityParameterNode2EditPart"/>
-            <popupPredefinedItem id="deleteFromDiagramAction" remove="true"/>
-         </popupContribution>
-         <popupContribution class="org.eclipse.gmf.runtime.diagram.ui.providers.DiagramContextMenuProvider">
-            <popupStructuredContributionCriteria objectClass="org.eclipse.epf.diagramming.edit.parts.ActivityParameterNodeName2EditPart"/>
-            <popupPredefinedItem id="deleteFromDiagramAction" remove="true"/>
-         </popupContribution>
-         <popupContribution class="org.eclipse.gmf.runtime.diagram.ui.providers.DiagramContextMenuProvider">
-            <popupStructuredContributionCriteria objectClass="org.eclipse.epf.diagramming.edit.parts.ControlFlowEditPart"/>
-            <popupPredefinedItem id="deleteFromDiagramAction" remove="true"/>
-         </popupContribution>
-         <popupContribution class="org.eclipse.gmf.runtime.diagram.ui.providers.DiagramContextMenuProvider">
-            <popupStructuredContributionCriteria objectClass="org.eclipse.epf.diagramming.edit.parts.ControlFlowNameEditPart"/>
-			<popupPredefinedItem id="deleteFromDiagramAction" remove="true"/> 
-            <popupPredefinedItem id="deleteFromModelAction" remove="true"/>
-         </popupContribution>
-         -->
-      </contributionItemProvider> 
-   </extension>
-
-   <extension point="org.eclipse.gmf.runtime.common.ui.services.action.globalActionHandlerProviders">
-      <GlobalActionHandlerProvider
-         class="org.eclipse.gmf.runtime.diagram.ui.providers.DiagramGlobalActionHandlerProvider"
-         id="ADPresentation">
-         <Priority name="Lowest"/>
-         <ViewId id="org.eclipse.epf.diagramming.part.DiagramEditorID">
-            <ElementType class="org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart">
-               <GlobalActionId actionId="delete"/>
-            </ElementType>
-            <ElementType class="org.eclipse.gmf.runtime.diagram.ui.editparts.DiagramEditPart">
-               <GlobalActionId actionId="save"/>
-            </ElementType>
-         </ViewId>
-      </GlobalActionHandlerProvider>
-      <GlobalActionHandlerProvider
-         class="org.eclipse.gmf.runtime.diagram.ui.providers.ide.providers.DiagramIDEGlobalActionHandlerProvider"
-         id="ADPresentationIDE">
-         <Priority name="Lowest"/>
-         <ViewId id="org.eclipse.epf.diagramming.part.DiagramEditorID">
-            <ElementType class="org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart">
-               <GlobalActionId actionId="bookmark"/>
-            </ElementType>
-         </ViewId>
-      </GlobalActionHandlerProvider>
-      <GlobalActionHandlerProvider
-            class="org.eclipse.gmf.runtime.diagram.ui.render.providers.DiagramUIRenderGlobalActionHandlerProvider"
-            id="ADRender">
-         <Priority name="Lowest"/>
-         <ViewId id="org.eclipse.epf.diagramming.part.DiagramEditorID">
-            <ElementType class="org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart">
-               <GlobalActionId actionId="cut"/>
-               <GlobalActionId actionId="copy"/>
-               <GlobalActionId actionId="paste"/>
-            </ElementType>
-         </ViewId>
-      </GlobalActionHandlerProvider>
-   </extension>
-
-   <extension point="org.eclipse.gmf.runtime.diagram.core.viewProviders">
-      <viewProvider class="org.eclipse.epf.diagramming.providers.UMLViewProvider">
-         <Priority name="Lowest"/>
-         <context viewClass="org.eclipse.gmf.runtime.notation.Diagram" semanticHints="AD"/>
-         <context viewClass="org.eclipse.gmf.runtime.notation.Node" semanticHints=""/>
-         <context viewClass="org.eclipse.gmf.runtime.notation.Edge" semanticHints=""/>
-      </viewProvider>
-   </extension>
-
-   <extension point="org.eclipse.gmf.runtime.diagram.ui.editpartProviders">
-      <editpartProvider class="org.eclipse.epf.diagramming.providers.UMLEditPartProvider">
-         <Priority name="Lowest"/>
-      </editpartProvider>
-   </extension>
-
-   <extension point="org.eclipse.gmf.runtime.diagram.ui.paletteProviders">
-      <paletteProvider class="org.eclipse.epf.diagramming.providers.UMLPaletteProvider">
-         <Priority name="Lowest"/>
-         <editor id="org.eclipse.epf.diagramming.part.DiagramEditorID"/>
-      </paletteProvider>
-      <paletteProvider
-			class="org.eclipse.gmf.runtime.diagram.ui.providers.DefaultPaletteProvider">
-        <Priority name="Medium"/>
-        <editor id="org.eclipse.epf.diagramming.part.DiagramEditorID"/>
-        <contribution>
-            <predefinedEntry    
-            	id="geoshapeDrawer" path="/">
-             </predefinedEntry> 
-        </contribution>
-      </paletteProvider>
-   </extension>
-
-   <extension point="org.eclipse.gmf.runtime.emf.ui.modelingAssistantProviders">
-      <modelingAssistantProvider class="org.eclipse.epf.diagramming.providers.UMLModelingAssistantProvider">
-         <Priority name="Lowest"/>
-      </modelingAssistantProvider>
-   </extension>
-
-   <extension point="org.eclipse.gmf.runtime.common.ui.services.properties.propertiesProviders">
-      <PropertiesProvider
-            verifyPluginLoaded="false"
-            class="org.eclipse.epf.diagramming.providers.UMLPropertyProvider">
-         <Priority name="Lowest"/>
-      </PropertiesProvider>
-   </extension>
-
-   <extension point="org.eclipse.gmf.runtime.common.ui.services.iconProviders">
-      <IconProvider class="org.eclipse.epf.diagramming.providers.UMLIconProvider">
-         <Priority name="Low"/>
-      </IconProvider>
-      <IconProvider
-            class="org.eclipse.gmf.runtime.diagram.ui.geoshapes.internal.providers.GeoShapeIconProvider">
-         <Priority
-               name="Medium">
-         </Priority>
-         <object class="org.eclipse.gmf.runtime.notation.View(org.eclipse.gmf.runtime.notation)" id="GeoShape">
-        	 <method name="getType()" value="oval,triangle,rectangle,shadowRectangle,rectangle3D,roundRectangle,hexagon,octagon,pentagon,diamond,cylinder,line"/>
-	     </object>
-         <context elements="GeoShape">
-         </context>
-      </IconProvider>
-   </extension>
-
-   <extension point="org.eclipse.gmf.runtime.common.ui.services.parserProviders">
-      <ParserProvider class="org.eclipse.epf.diagramming.providers.UMLParserProvider">
-         <Priority name="Lowest"/>
-      </ParserProvider>
-   </extension>
-
-   <extension point="org.eclipse.gmf.runtime.emf.type.core.elementTypes">
-
-      <metamodel nsURI="http://www.eclipse.org/uml2/2.0.0/UML">
-         <metamodelType
-               id="org.eclipse.epf.diagramming.Activity_79"
-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
-               eclass="Activity"
-               edithelper="org.eclipse.epf.diagramming.edit.helpers.ActivityEditHelper">
-            <param name="semanticHint" value="79"/>
-         </metamodelType>
-      </metamodel>
-
-      <metamodel nsURI="http://www.eclipse.org/uml2/2.0.0/UML">
-         <specializationType
-               id="org.eclipse.epf.diagramming.ActivityPartition_2001"
-               name="Activity Partition"
-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
-               edithelperadvice="org.eclipse.epf.diagramming.edit.helpers.ActivityPartitionEditHelperAdvice">
-            <specializes id="org.eclipse.epf.diagramming.ActivityPartition_1008"/>
-            <param name="semanticHint" value="2001"/>
-         </specializationType>
-      </metamodel>
-
-      <metamodel nsURI="http://www.eclipse.org/uml2/2.0.0/UML">
-         <metamodelType
-               id="org.eclipse.epf.diagramming.ActivityFinalNode_1001"
-               name="End Node"
-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
-               eclass="ActivityFinalNode"
-               edithelper="org.eclipse.epf.diagramming.edit.helpers.ActivityFinalNodeEditHelper">
-            <param name="semanticHint" value="1001"/>
-         </metamodelType>
-      </metamodel>
-
-      <metamodel nsURI="http://www.eclipse.org/uml2/2.0.0/UML">
-         <metamodelType
-               id="org.eclipse.epf.diagramming.MergeNode_1002"
-               name="Merge Node"
-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
-               eclass="MergeNode"
-               edithelper="org.eclipse.epf.diagramming.edit.helpers.MergeNodeEditHelper">
-            <param name="semanticHint" value="1002"/>
-         </metamodelType>
-      </metamodel>
-
-      <metamodel nsURI="http://www.eclipse.org/uml2/2.0.0/UML">
-         <metamodelType
-               id="org.eclipse.epf.diagramming.ForkNode_1003"
-               name="Fork Node"
-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
-               eclass="ForkNode"
-               edithelper="org.eclipse.epf.diagramming.edit.helpers.ForkNodeEditHelper">
-            <param name="semanticHint" value="1003"/>
-         </metamodelType>
-      </metamodel>
-
-      <metamodel nsURI="http://www.eclipse.org/uml2/2.0.0/UML">
-         <metamodelType
-               id="org.eclipse.epf.diagramming.InitialNode_1004"
-               name="Start Node"
-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
-               eclass="InitialNode"
-               edithelper="org.eclipse.epf.diagramming.edit.helpers.InitialNodeEditHelper">
-            <param name="semanticHint" value="1004"/>
-         </metamodelType>
-      </metamodel>
-
-      <metamodel nsURI="http://www.eclipse.org/uml2/2.0.0/UML">
-         <metamodelType
-               id="org.eclipse.epf.diagramming.DecisionNode_1005"
-               name="Decision Node"
-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
-               eclass="DecisionNode"
-               edithelper="org.eclipse.epf.diagramming.edit.helpers.DecisionNodeEditHelper">
-            <param name="semanticHint" value="1005"/>
-         </metamodelType>
-      </metamodel>
-
-      <metamodel nsURI="http://www.eclipse.org/uml2/2.0.0/UML">
-         <metamodelType
-               id="org.eclipse.epf.diagramming.JoinNode_1006"
-               name="Join Node"
-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
-               eclass="JoinNode"
-               edithelper="org.eclipse.epf.diagramming.edit.helpers.JoinNodeEditHelper">
-            <param name="semanticHint" value="1006"/>
-         </metamodelType>
-      </metamodel>
-
-      <metamodel nsURI="http://www.eclipse.org/uml2/2.0.0/UML">
-         <metamodelType
-               id="org.eclipse.epf.diagramming.StructuredActivityNode_1007"
-               name="Activity"
-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
-               eclass="StructuredActivityNode"
-               edithelper="org.eclipse.epf.diagramming.edit.helpers.StructuredActivityNodeEditHelper">
-            <param name="semanticHint" value="1007"/>
-         </metamodelType>
-      </metamodel>
-
-      <metamodel nsURI="http://www.eclipse.org/uml2/2.0.0/UML">
-         <metamodelType
-               id="org.eclipse.epf.diagramming.ActivityPartition_1008"
-               name="Activity Partition"
-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
-               eclass="ActivityPartition"
-               edithelper="org.eclipse.epf.diagramming.edit.helpers.ActivityPartitionEditHelper">
-            <param name="semanticHint" value="1008"/>
-         </metamodelType>
-      </metamodel>
-
-      <metamodel nsURI="http://www.eclipse.org/uml2/2.0.0/UML">
-         <metamodelType
-               id="org.eclipse.epf.diagramming.ActivityParameterNode_1009"
-               name="Task Descriptor"
-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
-               eclass="ActivityParameterNode"
-               edithelper="org.eclipse.epf.diagramming.edit.helpers.ActivityParameterNodeEditHelper">
-            <param name="semanticHint" value="1009"/>
-         </metamodelType>
-      </metamodel>
-
-      <metamodel nsURI="http://www.eclipse.org/uml2/2.0.0/UML">
-         <specializationType
-               id="org.eclipse.epf.diagramming.StructuredActivityNode_1010"
-               name="Phase"
-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
-               edithelperadvice="org.eclipse.epf.diagramming.edit.helpers.StructuredActivityNodeEditHelperAdvice">
-            <specializes id="org.eclipse.epf.diagramming.StructuredActivityNode_1007"/>
-            <param name="semanticHint" value="1010"/>
-         </specializationType>
-      </metamodel>
-
-      <metamodel nsURI="http://www.eclipse.org/uml2/2.0.0/UML">
-         <specializationType
-               id="org.eclipse.epf.diagramming.StructuredActivityNode_1011"
-               name="Iteration"
-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
-               edithelperadvice="org.eclipse.epf.diagramming.edit.helpers.StructuredActivityNode2EditHelperAdvice">
-            <specializes id="org.eclipse.epf.diagramming.StructuredActivityNode_1007"/>
-            <param name="semanticHint" value="1011"/>
-         </specializationType>
-      </metamodel>
-
-      <metamodel nsURI="http://www.eclipse.org/uml2/2.0.0/UML">
-         <specializationType
-               id="org.eclipse.epf.diagramming.ActivityParameterNode_1012"
-               name="Milestone"
-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
-               edithelperadvice="org.eclipse.epf.diagramming.edit.helpers.ActivityParameterNodeEditHelperAdvice">
-            <specializes id="org.eclipse.epf.diagramming.ActivityParameterNode_1009"/>
-            <param name="semanticHint" value="1012"/>
-         </specializationType>
-      </metamodel>
-
-      <metamodel nsURI="http://www.eclipse.org/uml2/2.0.0/UML">
-         <metamodelType
-               id="org.eclipse.epf.diagramming.ControlFlow_3001"
-               name="Control Flow"
-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
-               eclass="ControlFlow"
-               edithelper="org.eclipse.epf.diagramming.edit.helpers.ControlFlowEditHelper">
-            <param name="semanticHint" value="3001"/>
-         </metamodelType>
-      </metamodel>
-   </extension>
-
-   <extension point="org.eclipse.gmf.runtime.emf.type.core.elementTypeBindings">
-      <clientContext id="ADClientContext">
-         <enablement>
-            <test
-               property="org.eclipse.gmf.runtime.emf.core.editingDomain"
-               value="org.eclipse.epf.diagramming.EditingDomain"/>
-         </enablement>
-      </clientContext> 
-      <binding context="ADClientContext">
-         <elementType ref="org.eclipse.epf.diagramming.Activity_79"/>
-         <elementType ref="org.eclipse.epf.diagramming.ActivityPartition_2001"/>
-         <elementType ref="org.eclipse.epf.diagramming.ActivityFinalNode_1001"/>
-         <elementType ref="org.eclipse.epf.diagramming.MergeNode_1002"/>
-         <elementType ref="org.eclipse.epf.diagramming.ForkNode_1003"/>
-         <elementType ref="org.eclipse.epf.diagramming.InitialNode_1004"/>
-         <elementType ref="org.eclipse.epf.diagramming.DecisionNode_1005"/>
-         <elementType ref="org.eclipse.epf.diagramming.JoinNode_1006"/>
-         <elementType ref="org.eclipse.epf.diagramming.StructuredActivityNode_1007"/>
-         <elementType ref="org.eclipse.epf.diagramming.ActivityPartition_1008"/>
-         <elementType ref="org.eclipse.epf.diagramming.ActivityParameterNode_1009"/>
-         <elementType ref="org.eclipse.epf.diagramming.StructuredActivityNode_1010"/>
-         <elementType ref="org.eclipse.epf.diagramming.StructuredActivityNode_1011"/>
-         <elementType ref="org.eclipse.epf.diagramming.ActivityParameterNode_1012"/>
-         <elementType ref="org.eclipse.epf.diagramming.ControlFlow_3001"/>
-         <advice ref="org.eclipse.gmf.runtime.diagram.core.advice.notationDepdendents"/>
-         <elementType pattern=".*"/>
-      </binding>
-   </extension>
-</plugin>
-
diff --git a/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/EPFDiagramPlugin.java b/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/EPFDiagramPlugin.java
deleted file mode 100644
index e6d26e8..0000000
--- a/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/EPFDiagramPlugin.java
+++ /dev/null
@@ -1,80 +0,0 @@
-//------------------------------------------------------------------------------
-// Copyright (c) 2005, 2007 IBM Corporation 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:
-// IBM Corporation - initial implementation
-//------------------------------------------------------------------------------
-package org.eclipse.epf.diagramming;
-
-import org.eclipse.epf.common.plugin.AbstractPlugin;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.swt.graphics.Image;
-import org.osgi.framework.BundleContext;
-
-/**
- * The activator class controls the plug-in life cycle
- */
-public class EPFDiagramPlugin extends AbstractPlugin {
-
-	// The plug-in ID
-	public static final String PLUGIN_ID = "org.eclipse.epf.diagramming";
-
-	// The shared instance
-	private static EPFDiagramPlugin plugin;
-	
-	/**
-	 * The constructor
-	 */
-	public EPFDiagramPlugin() {
-		plugin = this;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)
-	 */
-	public void start(BundleContext context) throws Exception {
-		super.start(context);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext)
-	 */
-	public void stop(BundleContext context) throws Exception {
-		plugin = null;
-		super.stop(context);
-	}
-
-	/**
-	 * Returns the shared instance
-	 *
-	 * @return the shared instance
-	 */
-	public static EPFDiagramPlugin getDefault() {
-		return plugin;
-	}
-	
-	/**
-	 * Return image based on given path
-	 * 
-	 * @param imageFilePath
-	 * @return image
-	 */
-	public Image getImage(String imageFilePath) {
-		Image image = null;
-		ImageDescriptor imageDescriptor = imageDescriptorFromPlugin(PLUGIN_ID, imageFilePath);
-		if (imageDescriptor != null) {
-			image = imageDescriptor.createImage(false);
-		}
-		return image;
-	}
-	
-	public static String getPluginId(){
-		return PLUGIN_ID;
-	}
-}
diff --git a/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/base/Constants.java b/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/base/Constants.java
deleted file mode 100644
index 2b2d72a..0000000
--- a/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/base/Constants.java
+++ /dev/null
@@ -1,26 +0,0 @@
-//------------------------------------------------------------------------------
-// Copyright (c) 2005, 2007 IBM Corporation 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:
-// IBM Corporation - initial implementation
-//------------------------------------------------------------------------------
-/**
- * 
- */
-package org.eclipse.epf.diagramming.base;
-
-/**
- * @author Shashidhar Kannoori
- *
- */
-public class Constants {
-
-		public static final String UMA_SOURCE = "uma_src";
-		public static final String UMA_EDITOR_INPUT = "uma_editor_input";
-		public static final String UMA_ELEMENT = "uma_element";
-		public static final String UMA_ELEMENT_GUID = "uma_guid";
-}
diff --git a/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/base/DiagrammingResources.java b/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/base/DiagrammingResources.java
deleted file mode 100644
index a858f58..0000000
--- a/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/base/DiagrammingResources.java
+++ /dev/null
@@ -1,58 +0,0 @@
-//------------------------------------------------------------------------------
-// Copyright (c) 2005, 2007 IBM Corporation 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:
-// IBM Corporation - initial implementation
-//------------------------------------------------------------------------------
-/**
- * 
- */
-package org.eclipse.epf.diagramming.base;
-
-import org.eclipse.osgi.util.NLS;
-
-/**
- * @author Shashidhar Kannoori
- *
- */
-public class DiagrammingResources extends NLS {
-
-	private static final String BUNDLE_NAME = "org.eclipse.epf.diagramming.Resources";//$NON-NLS-1$
-	/**
-	 * 
-	 */
-	public DiagrammingResources() {
-		// TODO Auto-generated constructor stub
-	}
-	
-	static {
-		NLS.initializeMessages(BUNDLE_NAME, DiagrammingResources.class);
-	}
-	
-	public static String FileDocumentProvider_createElementInfo;
-	public static String FileDocumentProvider_error_out_of_sync;
-	public static String FileDocumentProvider_task_saving;
-	public static String FileDocumentProvider_resetDocument;
-	public static String FileDocumentProvider_resourceChanged;
-	public static String FileDocumentProvider_handleElementContentChanged;
-	
-	public static String StorageDocumentProvider_createElementInfo;
-	public static String StorageDocumentProvider_updateCache;
-	public static String StorageDocumentProvider_isReadOnly;
-	public static String StorageDocumentProvider_isModifiable;
-	
-	public static String WizardPage_DIAGRAM_CREATION_FAIL_EXC_;
-
-	public static String WizardPage_Message_FileExists_ERROR_;
-
-	public static String FileCreator_TaskTitle;
-	public static String EditorWizardPage_DialogInternalErrorTitle;
-	public static String EditorWizardPage_InvalidFilename; 
-	
-	public static String FileSaveAs_DialogTitle;
-	public static String FileSaveAs_DialogMessageText;
-}
diff --git a/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/base/EpfDiagramActionProvider.java b/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/base/EpfDiagramActionProvider.java
deleted file mode 100644
index 65c5d72..0000000
--- a/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/base/EpfDiagramActionProvider.java
+++ /dev/null
@@ -1,53 +0,0 @@
-//------------------------------------------------------------------------------
-// Copyright (c) 2005, 2007 IBM Corporation 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:
-// IBM Corporation - initial implementation
-//------------------------------------------------------------------------------
-/**
- * 
- */
-package org.eclipse.epf.diagramming.base;
-
-import org.eclipse.epf.diagramming.base.actions.ActionIds;
-import org.eclipse.epf.diagramming.base.actions.OrientationAction;
-import org.eclipse.gmf.runtime.common.ui.services.action.contributionitem.AbstractContributionItemProvider;
-import org.eclipse.gmf.runtime.common.ui.util.IWorkbenchPartDescriptor;
-import org.eclipse.jface.action.IAction;
-import org.eclipse.ui.IWorkbenchPage;
-
-/**
- * @author Shashidhar Kannoori
- *
- */
-public class EpfDiagramActionProvider extends AbstractContributionItemProvider {
-
-	/**
-	 * 
-	 */
-	public EpfDiagramActionProvider() {
-		// TODO Auto-generated constructor stub
-	}
-	
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.gmf.runtime.common.ui.services.action.contributionitem.AbstractContributionItemProvider#createAction(java.lang.String, org.eclipse.gmf.runtime.common.ui.util.IWorkbenchPartDescriptor)
-	 * @modified
-	 */
-	protected IAction createAction(String actionId, IWorkbenchPartDescriptor partDescriptor) {
-		
-		IWorkbenchPage page = partDescriptor.getPartPage();
-		if(actionId.equals(ActionIds.ACTION_V_ORIENTATION)){
-			OrientationAction action = new OrientationAction(page,
-					actionId);
-			action.setId(actionId);
-			action.setText("vOrientation");
-			action.setToolTipText("vOrientation");
-		}
-		return super.createAction(actionId, partDescriptor);
-	}
-}
diff --git a/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/base/Resources.properties b/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/base/Resources.properties
deleted file mode 100644
index 42c9ae0..0000000
--- a/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/base/Resources.properties
+++ /dev/null
@@ -1,43 +0,0 @@
-# ==============================================================================
-#*+------------------------------------------------------------------------+
-#*| Copyright (c) 2000, 2005   IBM Corporation 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:                                                          |
-#*|    IBM Corporation - initial API and implementation                    |
-#*+------------------------------------------------------------------------+
-# ==============================================================================
-
-
-## Errors ##
-
-FileDocumentProvider_createElementInfo=FileDocumentProvider.createElementInfo
-FileDocumentProvider_error_out_of_sync=The file has been changed on the file system
-FileDocumentProvider_task_saving=Saving
-FileDocumentProvider_resetDocument=FileDocumentProvider.resetDocument
-FileDocumentProvider_resourceChanged=FileDocumentProvider.resourceChanged
-FileDocumentProvider_handleElementContentChanged=FileDocumentProvider.handleElementContentChanged
-
-StorageDocumentProvider_createElementInfo=StorageDocumentProvider.createElementInfo
-StorageDocumentProvider_updateCache=StorageDocumentProvider.updateCache
-StorageDocumentProvider_isReadOnly=StorageDocumentProvider.isReadOnly
-StorageDocumentProvider_isModifiable=StorageDocumentProvider.isModifiable
-
-#--- Exceptions ---
-WizardPage_DIAGRAM_CREATION_FAIL_EXC_=Unable to create diagram file
-
-#--- Errors ---
-WizardPage_Message_FileExists_ERROR_=The same name already exists.
-
-#---- File creation
-FileCreator_TaskTitle = Creating
-EditorWizardPage_DialogInternalErrorTitle=Creation Problems
-EditorWizardPage_InvalidFilename = ''{0}'' is not a valid file name. 
-
-#---- File Save As
-FileSaveAs_DialogTitle =Problem During Save As...
-FileSaveAs_DialogMessageText =Save could not be completed. Target file is already open in another editor.
-
diff --git a/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/base/actions/ActionIds.java b/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/base/actions/ActionIds.java
deleted file mode 100644
index 1ec1261..0000000
--- a/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/base/actions/ActionIds.java
+++ /dev/null
@@ -1,20 +0,0 @@
-//------------------------------------------------------------------------------
-// Copyright (c) 2005, 2007 IBM Corporation 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:
-// IBM Corporation - initial implementation
-//------------------------------------------------------------------------------
-package org.eclipse.epf.diagramming.base.actions;
-
-/**
- * @author skannoor
- */
-public interface ActionIds {
-	public static final String ACTION_V_ORIENTATION = "vOrientationAction";
-	public static final String ACTION_H_ORIENTATION = "hOrientationAction";
-	
-}
diff --git a/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/base/actions/OpenActivityDetailDiagramAction.java b/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/base/actions/OpenActivityDetailDiagramAction.java
deleted file mode 100644
index a59db0d..0000000
--- a/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/base/actions/OpenActivityDetailDiagramAction.java
+++ /dev/null
@@ -1,78 +0,0 @@
-/**
- * 
- */
-package org.eclipse.epf.diagramming.base.actions;
-
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.epf.diagram.core.bridge.BridgeHelper;
-import org.eclipse.epf.diagram.core.bridge.DiagramAdapter;
-import org.eclipse.epf.diagram.core.bridge.NodeAdapter;
-import org.eclipse.epf.diagram.core.part.DiagramEditorInput;
-import org.eclipse.epf.diagram.core.part.util.DiagramEditorUtil;
-import org.eclipse.epf.diagramming.part.EPFDiagramEditorPlugin;
-import org.eclipse.epf.library.edit.util.IDiagramManager;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.DiagramEditPart;
-import org.eclipse.gmf.runtime.notation.Diagram;
-import org.eclipse.gmf.runtime.notation.Node;
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.ui.IObjectActionDelegate;
-import org.eclipse.ui.IWorkbenchPart;
-
-/**
- * Action to open activity detail diagram for selected Activity.
- * @author Shashidhar Kannoori
- */
-public class OpenActivityDetailDiagramAction implements IObjectActionDelegate {
-
-	private EditPart selectedPart;
-	private IWorkbenchPart targetPart;
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.IObjectActionDelegate#setActivePart(org.eclipse.jface.action.IAction, org.eclipse.ui.IWorkbenchPart)
-	 */
-	public void setActivePart(IAction action, IWorkbenchPart targetPart) {
-		this.targetPart = targetPart;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.IActionDelegate#run(org.eclipse.jface.action.IAction)
-	 */
-	public void run(IAction action) {
-		
-		
-		if(selectedPart != null){
-			Node view = (Node)selectedPart.getModel();
-			DiagramEditPart diagramEditPart = (DiagramEditPart)selectedPart.getParent();
-			Diagram diagram = (Diagram)diagramEditPart.getModel();
-			DiagramAdapter diagramAdapter = BridgeHelper.getDiagramAdapter(diagram.getElement());
-			
-			NodeAdapter adapter = BridgeHelper.getNodeAdapter(view.getElement());
-			Object selectedObject = adapter.getWrapper();
-			if(selectedObject == null){
-				selectedObject = adapter.getElement();
-			}
-			//IEditorPart parent = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().getActiveEditor();
-			DiagramEditorInput input = new org.eclipse.epf.diagram.core.part.DiagramEditorInput(
-					selectedObject, diagramAdapter.getSuppression(), IDiagramManager.ACTIVITY_DIAGRAM);
-			DiagramEditorUtil.openDiagramEditor(targetPart.getSite().getPage(), input, 
-					EPFDiagramEditorPlugin.DIAGRAM_PREFERENCES_HINT, new NullProgressMonitor());
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.IActionDelegate#selectionChanged(org.eclipse.jface.action.IAction, org.eclipse.jface.viewers.ISelection)
-	 */
-	public void selectionChanged(IAction action, ISelection selection) {
-		if (selection instanceof IStructuredSelection) {
-			IStructuredSelection structuredSelection = (IStructuredSelection) selection;
-			if (structuredSelection.size() == 1
-					&& structuredSelection.getFirstElement() instanceof EditPart) {
-				selectedPart = (EditPart) structuredSelection
-						.getFirstElement();
-			}
-		}
-	}
-}
diff --git a/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/base/actions/OrientationAction.java b/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/base/actions/OrientationAction.java
deleted file mode 100644
index 8f568b8..0000000
--- a/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/base/actions/OrientationAction.java
+++ /dev/null
@@ -1,64 +0,0 @@
-//------------------------------------------------------------------------------
-// Copyright (c) 2005, 2007 IBM Corporation 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:
-// IBM Corporation - initial implementation
-//------------------------------------------------------------------------------
-/**
- * 
- */
-package org.eclipse.epf.diagramming.base.actions;
-
-import org.eclipse.gef.Request;
-import org.eclipse.gmf.runtime.diagram.ui.actions.DiagramAction;
-import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.IWorkbenchPart;
-
-/**
- * @author Shashidhar Kannoori
- *
- */
-public class OrientationAction extends DiagramAction {
-	
-	public OrientationAction(IWorkbenchPage workbenchPage, String orienation) {
-		super(workbenchPage);
-		setId(orienation);
-	}
-	
-	public OrientationAction(IWorkbenchPart workbenchpart, String oriientation) {
-		super(workbenchpart);
-		setId(oriientation);
-	}
-	/**
-	 * @param workbenchPage
-	 */
-	public OrientationAction(IWorkbenchPage workbenchPage) {
-		super(workbenchPage);
-	}
-
-	/**
-	 * @param workbenchpart
-	 */
-	public OrientationAction(IWorkbenchPart workbenchpart) {
-		super(workbenchpart);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.gmf.runtime.diagram.ui.actions.DiagramAction#createTargetRequest()
-	 */
-	protected Request createTargetRequest() {
-		return new OrientationRequest(getId());
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.gmf.runtime.diagram.ui.actions.DiagramAction#isSelectionListener()
-	 */
-	protected boolean isSelectionListener() {
-		return true;
-	}
-	
-}
diff --git a/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/base/actions/OrientationRequest.java b/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/base/actions/OrientationRequest.java
deleted file mode 100644
index f4db9b7..0000000
--- a/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/base/actions/OrientationRequest.java
+++ /dev/null
@@ -1,37 +0,0 @@
-//------------------------------------------------------------------------------
-// Copyright (c) 2005, 2007 IBM Corporation 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:
-// IBM Corporation - initial implementation
-//------------------------------------------------------------------------------
-package org.eclipse.epf.diagramming.base.actions;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.requests.LocationRequest;
-
-/**
- * Request is communication object for command and ui. Orientation Request is 
- * for vertical or horizontal orientation of EditPart 
- */
-public class OrientationRequest extends LocationRequest {
-
-	protected List editParts;
-	
-	public OrientationRequest(String type) {
-		super(type);
-	}
-	
-	public void setSelected(List editParts){
-		this.editParts = new ArrayList(editParts);
-	}
-	public List getSelected(){
-		return editParts;
-	}
-}	
diff --git a/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/base/commands/ActivityPartitionDestroyCommand.java b/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/base/commands/ActivityPartitionDestroyCommand.java
deleted file mode 100644
index 278e640..0000000
--- a/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/base/commands/ActivityPartitionDestroyCommand.java
+++ /dev/null
@@ -1,86 +0,0 @@
-//------------------------------------------------------------------------------
-// Copyright (c) 2005, 2007 IBM Corporation 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:
-// IBM Corporation - initial implementation
-//------------------------------------------------------------------------------
-/**
- * 
- */
-package org.eclipse.epf.diagramming.base.commands;
-
-import java.util.Collection;
-
-import org.eclipse.emf.ecore.EAnnotation;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EReference;
-import org.eclipse.emf.ecore.EStructuralFeature.Setting;
-import org.eclipse.emf.ecore.util.EcoreUtil;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gmf.runtime.emf.core.util.CrossReferenceAdapter;
-import org.eclipse.gmf.runtime.emf.type.core.commands.DestroyElementCommand;
-import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;
-import org.eclipse.gmf.runtime.notation.View;
-
-/**
- * DestroyCommand to destroy ActivityPartition and all the elements inside the partitions.
- * @author Shashidhar Kannoori
- *
- */
-public class ActivityPartitionDestroyCommand extends DestroyElementCommand {
-
-	
-	private EditPart host;
-
-	/**
-	 * @param request
-	 */
-	public ActivityPartitionDestroyCommand(DestroyElementRequest request, EditPart host) {
-		super(request);
-		this.host = host;
-		// TODO Auto-generated constructor stub
-	}
-	
-	protected EObject getElementToDestroy() {
-		View view = (View) host.getModel();
-		EAnnotation annotation = view.getEAnnotation("Shortcut"); //$NON-NLS-1$
-		if (annotation != null) {
-			return view;
-		}
-		return super.getElementToDestroy();
-	}
-	
-	protected void tearDownIncomingReferences(EObject destructee) {
-		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter
-				.getExistingCrossReferenceAdapter(destructee);
-		if (crossReferencer != null) {
-			Collection inverseReferences = crossReferencer
-					.getInverseReferences(destructee);
-			if (inverseReferences != null) {
-				int size = inverseReferences.size();
-				if (size > 0) {
-					Setting setting;
-					EReference eRef;
-					Setting[] settings = (Setting[]) inverseReferences
-							.toArray(new Setting[size]);
-					for (int i = 0; i < size; ++i) {
-						setting = settings[i];
-						eRef = (EReference) setting
-								.getEStructuralFeature();
-						if (eRef.isChangeable()
-								&& (eRef.isDerived() == false)
-								&& (eRef.isContainment() == false)
-								&& (eRef.isContainer() == false)) {
-							EcoreUtil.remove(setting.getEObject());
-						}
-					}
-				}
-			}
-		}
-	}
-
-}
diff --git a/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/base/commands/CreateActivityNodeInActivityPartition.java b/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/base/commands/CreateActivityNodeInActivityPartition.java
deleted file mode 100644
index 598b9dd..0000000
--- a/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/base/commands/CreateActivityNodeInActivityPartition.java
+++ /dev/null
@@ -1,129 +0,0 @@
-//------------------------------------------------------------------------------
-// Copyright (c) 2005, 2007 IBM Corporation 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:
-// IBM Corporation - initial implementation
-//------------------------------------------------------------------------------
-/**
- * 
- */
-package org.eclipse.epf.diagramming.base.commands;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EReference;
-import org.eclipse.gmf.runtime.emf.core.util.PackageUtil;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.gmf.runtime.emf.type.core.commands.CreateElementCommand;
-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.uml2.uml.ActivityNode;
-import org.eclipse.uml2.uml.ActivityPartition;
-import org.eclipse.uml2.uml.UMLPackage;
-
-/**
- * @author Shashidhar Kannoori
- *
- */
-public class CreateActivityNodeInActivityPartition extends CreateElementCommand {
-
-	/**
-	 * @param request
-	 */
-	public CreateActivityNodeInActivityPartition(CreateElementRequest request) {
-		super(request);
-		// TODO Auto-generated constructor stub
-	}
-	
-	/**
-	 * 
-	 */
-	protected EClass getEClassToEdit() {
-		return UMLPackage.eINSTANCE.getActivity();
-	};
-
-	/**
-	 * @modified
-	 */
-	protected EObject getElementToEdit() {
-		EObject container = ((CreateElementRequest) getRequest())
-				.getContainer();
-		if (container instanceof View) {
-			container = ((View) container).getElement();
-		}
-		if(container instanceof ActivityPartition){
-			container = container.eContainer();
-		}
-		return container;
-	}
-	public boolean canExecute() {
-		return super.canExecute();
-	}
-	
-	/**
-	 * (non-Javadoc)
-	 * @see org.eclipse.gmf.runtime.emf.commands.core.command.AbstractTransactionalCommand#doExecute(org.eclipse.core.runtime.IProgressMonitor, org.eclipse.core.runtime.IAdaptable)
-	 * @modified
-	 */
-	protected IStatus doExecute(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
-		IStatus status = null;
-		status = super.doExecute(monitor, info);
-		EObject newElement = getNewElement();
-		
-		if (newElement instanceof ActivityNode) 
-		{
-			EObject obj = getOriginalContainer();
-			if (obj instanceof ActivityPartition) {
-				// set inpartition 
-				((ActivityNode) newElement).getInPartitions().add(obj);
-			}
-		}
-		return status;
-	}
-	
-	
-
-	/**
-	 * @custom
-	 */
-	private EObject getOriginalContainer()
-	{
-		return ((CreateElementRequest) getRequest()).getContainer();
-	}
-	
-	/**
-	 * Gets the containment feature for the new element.
-	 * 
-	 * @return the containment feature
-	 * @modified
-	 */
-	protected EReference getContainmentFeature() {
-
-		/**
-		 * The containment feature in which the new element will be created.
-		 */
-		EReference containmentFeature=null;
-		if (containmentFeature == null) {
-			EClass classToEdit = getEClassToEdit();
-
-			if (classToEdit != null) {
-				IElementType type = getElementType();
-
-				if (type != null && type.getEClass() != null) {
-					containmentFeature = PackageUtil.findFeature(classToEdit,
-							type.getEClass());
-				}
-			}
-		}
-
-		return containmentFeature;
-	}
-}
diff --git a/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/base/commands/CreateDiagramCommand.java b/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/base/commands/CreateDiagramCommand.java
deleted file mode 100644
index d1d6137..0000000
--- a/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/base/commands/CreateDiagramCommand.java
+++ /dev/null
@@ -1,115 +0,0 @@
-//------------------------------------------------------------------------------
-// Copyright (c) 2005, 2007 IBM Corporation 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:
-// IBM Corporation - initial implementation
-//------------------------------------------------------------------------------
-/**
- * 
- */
-package org.eclipse.epf.diagramming.base.commands;
-
-import java.io.IOException;
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.epf.diagram.core.part.DiagramEditorInput;
-import org.eclipse.epf.diagramming.base.util.UmaUmlUtil;
-import org.eclipse.epf.diagramming.part.EPFDiagramEditorPlugin;
-import org.eclipse.epf.uma.MethodElement;
-import org.eclipse.gmf.runtime.common.core.command.CommandResult;
-import org.eclipse.gmf.runtime.diagram.core.services.ViewService;
-import org.eclipse.gmf.runtime.emf.commands.core.command.AbstractTransactionalCommand;
-import org.eclipse.gmf.runtime.notation.Diagram;
-import org.eclipse.ui.IEditorInput;
-import org.eclipse.uml2.uml.Activity;
-import org.eclipse.uml2.uml.UMLFactory;
-
-/**
- * @author Shashidhar Kannoori
- *
- */
-public class CreateDiagramCommand extends AbstractTransactionalCommand {
-
-	public static String COMMAND_LABEL = "Creating diagram and model"; 
-	private IEditorInput input;
-	private Resource diagramResource;
-	private String kindParam;
-	//private TransactionalEditingDomain domain;
-	/**
-	 * @param domain
-	 * @param label
-	 * @param affectedFiles
-	 */
-	public CreateDiagramCommand(TransactionalEditingDomain domain,
-			String label, List affectedFiles, 
-			IEditorInput input, Resource diagramResouce,
-			String kindParam) {
-		super(domain, label, affectedFiles);
-		this.input = input;
-		this.diagramResource = diagramResouce;
-		this.kindParam = kindParam;
-	}
-
-	/**
-	 * @param domain
-	 * @param label
-	 * @param options
-	 * @param affectedFiles
-	 */
-	public CreateDiagramCommand(TransactionalEditingDomain domain,
-			String label, Map options, List affectedFiles) {
-		super(domain, label, options, affectedFiles);
-		///this.domain = domain;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.gmf.runtime.emf.commands.core.command.AbstractTransactionalCommand#doExecuteWithResult(org.eclipse.core.runtime.IProgressMonitor, org.eclipse.core.runtime.IAdaptable)
-	 */
-	protected CommandResult doExecuteWithResult(IProgressMonitor monitor,
-			IAdaptable info) throws ExecutionException {
-		Activity model = createInitialModel();
-		diagramResource.getContents().add(model);
-		Diagram diagram = ViewService.createDiagram(model, kindParam,
-				EPFDiagramEditorPlugin.DIAGRAM_PREFERENCES_HINT);
-		if (diagram != null) {
-			
-			MethodElement methodElement = ((DiagramEditorInput)input).getMethodElement();
-			if(methodElement != null && methodElement instanceof org.eclipse.epf.uma.Activity){
-				UmaUmlUtil.createEAnnotationForUml(model, methodElement.getGuid());
-			}
-			
-			diagramResource.getContents().add(diagram);
-			diagram.setName(methodElement.getName());
-			diagram.setElement(model);
-		}
-		try {
-			diagramResource.save(Collections.EMPTY_MAP);
-		} catch (IOException e) {
-
-			EPFDiagramEditorPlugin.getInstance().logError(
-					"Unable to store model and diagram resources", e); //$NON-NLS-1$
-		}
-		return CommandResult.newOKCommandResult();	
-	}
-	
-	/**
-	 * Create a new instance of domain element associated with canvas.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private static Activity createInitialModel() {
-		return UMLFactory.eINSTANCE.createActivity();
-	}
-}
diff --git a/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/base/commands/CreateIncomingControlFlowCommand.java b/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/base/commands/CreateIncomingControlFlowCommand.java
deleted file mode 100644
index 7e2d32c..0000000
--- a/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/base/commands/CreateIncomingControlFlowCommand.java
+++ /dev/null
@@ -1,87 +0,0 @@
-//------------------------------------------------------------------------------
-// Copyright (c) 2005, 2007 IBM Corporation 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:
-// IBM Corporation - initial implementation
-//------------------------------------------------------------------------------
-/**
- * 
- */
-package org.eclipse.epf.diagramming.base.commands;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.gmf.runtime.emf.type.core.commands.CreateRelationshipCommand;
-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;
-import org.eclipse.uml2.uml.ActivityNode;
-import org.eclipse.uml2.uml.ControlFlow;
-import org.eclipse.uml2.uml.UMLPackage;
-
-/**
- * @author Shashidhar Kannoori
- *
- */
-public class CreateIncomingControlFlowCommand extends CreateRelationshipCommand {
-
-	/**
-	 * 
-	 * @param request
-	 * @param element
-	 */
-	public CreateIncomingControlFlowCommand(CreateRelationshipRequest request,
-			EObject element) {
-		super(request);
-		setElementToEdit(element);
-	}
-	/**
-	 * @param request
-	 */
-	public CreateIncomingControlFlowCommand(CreateRelationshipRequest request) {
-		super(request);
-		// TODO Auto-generated constructor stub
-	}
-	protected EClass getEClassToEdit() {
-		return UMLPackage.eINSTANCE.getActivity();
-	}
-	
-	public boolean canExecute() {
-//		if(getSource() == null)
-//			return false;
-//		
-//		if (getEClassToEdit() == null) {
-//			return false;
-//		}
-//
-//		if (getContainmentFeature() != null) {
-//			EClassifier eClassifier = getContainmentFeature().getEType();
-//			boolean result = true;
-//
-//			if (eClassifier instanceof EClass) {
-//				result = ((EClass) eClassifier).isSuperTypeOf(getElementType()
-//						.getEClass());
-//			}
-//
-//			result = result
-//					&& PackageUtil.canReference(getEClassToEdit(),
-//							getContainmentFeature(), getElementType()
-//									.getEClass());
-//
-//			return result;
-//		}
-//		return false;
-		return super.canExecute();
-	}
-	protected EObject doDefaultElementCreation() {
-		ControlFlow newElement = (ControlFlow) super.doDefaultElementCreation();
-		if (newElement != null) {
-			newElement.setTarget((ActivityNode) getTarget());
-			newElement.setSource((ActivityNode) getSource());
-		}
-		return newElement;
-	}
-	
-}
diff --git a/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/base/commands/CreateOutgoingControlFlowCommand.java b/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/base/commands/CreateOutgoingControlFlowCommand.java
deleted file mode 100644
index 1739094..0000000
--- a/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/base/commands/CreateOutgoingControlFlowCommand.java
+++ /dev/null
@@ -1,91 +0,0 @@
-//------------------------------------------------------------------------------
-// Copyright (c) 2005, 2007 IBM Corporation 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:
-// IBM Corporation - initial implementation
-//------------------------------------------------------------------------------
-/**
- * 
- */
-package org.eclipse.epf.diagramming.base.commands;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EClassifier;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.gmf.runtime.emf.core.util.PackageUtil;
-import org.eclipse.gmf.runtime.emf.type.core.commands.CreateRelationshipCommand;
-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;
-import org.eclipse.uml2.uml.ActivityNode;
-import org.eclipse.uml2.uml.ControlFlow;
-import org.eclipse.uml2.uml.UMLPackage;
-
-/**
- * @author Shashidhar Kannoori
- *
- */
-public class CreateOutgoingControlFlowCommand extends CreateRelationshipCommand {
-
-	/**
-	 * 
-	 * @param request
-	 * @param element
-	 */
-	public CreateOutgoingControlFlowCommand(CreateRelationshipRequest request,
-			EObject element) {
-		super(request);
-		setElementToEdit(element);
-	}
-	/**
-	 * @param request
-	 */
-	public CreateOutgoingControlFlowCommand(CreateRelationshipRequest request) {
-		super(request);
-		// TODO Auto-generated constructor stub
-	}
-	protected EClass getEClassToEdit() {
-		return UMLPackage.eINSTANCE.getActivityNode();
-	}
-	
-	public boolean canExecute() {
-		if(getSource() == null)
-			return false;
-		
-		if (getEClassToEdit() == null) {
-			return false;
-		}
-
-		if (getContainmentFeature() != null) {
-			EClassifier eClassifier = getContainmentFeature().getEType();
-			boolean result = true;
-
-			if (eClassifier instanceof EClass) {
-				result = ((EClass) eClassifier).isSuperTypeOf(getElementType()
-						.getEClass());
-			}
-
-			result = result
-					&& PackageUtil.canReference(getEClassToEdit(),
-							getContainmentFeature(), getElementType()
-									.getEClass());
-
-			return result;
-		}
-		return false;
-		//return super.canExecute();
-	}
-	
-	protected EObject doDefaultElementCreation() {
-		// TODO: Resolve the source and target properly.
-		ControlFlow newElement = (ControlFlow) super.doDefaultElementCreation();
-		if (newElement != null) {
-			newElement.setTarget((ActivityNode) getTarget());
-			newElement.setSource((ActivityNode) getSource());
-		}
-		return newElement;
-	}
-	
-}
diff --git a/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/base/commands/CreateRelationShipCommandStructuredActivity.java b/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/base/commands/CreateRelationShipCommandStructuredActivity.java
deleted file mode 100644
index b052e8e..0000000
--- a/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/base/commands/CreateRelationShipCommandStructuredActivity.java
+++ /dev/null
@@ -1,66 +0,0 @@
-//------------------------------------------------------------------------------
-// Copyright (c) 2005, 2007 IBM Corporation 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:
-// IBM Corporation - initial implementation
-//------------------------------------------------------------------------------
-/**
- * 
- */
-package org.eclipse.epf.diagramming.base.commands;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.gmf.runtime.emf.type.core.commands.CreateRelationshipCommand;
-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;
-import org.eclipse.uml2.uml.ActivityNode;
-import org.eclipse.uml2.uml.ControlFlow;
-import org.eclipse.uml2.uml.UMLPackage;
-
-/**
- * @author Shashidhar Kannoori
- *
- */
-public class CreateRelationShipCommandStructuredActivity extends
-		CreateRelationshipCommand {
-
-	/**
-	 * @param request
-	 */
-	public CreateRelationShipCommandStructuredActivity(
-			CreateRelationshipRequest request, EObject element) {
-		super(request);
-		setElementToEdit(element);
-		// TODO Auto-generated constructor stub
-	}
-	
-	/**
-	 * 
-	 */
-	protected EClass getEClassToEdit() {
-		return UMLPackage.eINSTANCE.getStructuredActivityNode();
-	};
-
-
-	/**
-	 * 
-	 */
-	protected EObject doDefaultElementCreation() {
-		ControlFlow newElement = (ControlFlow) super
-				.doDefaultElementCreation();
-		if (newElement != null) {
-			newElement.setTarget((ActivityNode) getTarget());
-			newElement.setSource((ActivityNode) getSource());
-		}
-		return newElement;
-	}
-
-	public boolean canExecute() {
-		// TODO Auto-generated method stub
-		return super.canExecute();
-	}
-}
diff --git a/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/base/commands/OrientationCommand.java b/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/base/commands/OrientationCommand.java
deleted file mode 100644
index fdd34e1..0000000
--- a/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/base/commands/OrientationCommand.java
+++ /dev/null
@@ -1,92 +0,0 @@
-//------------------------------------------------------------------------------
-// Copyright (c) 2005, 2007 IBM Corporation 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:
-// IBM Corporation - initial implementation
-//------------------------------------------------------------------------------
-/**
- * 
- */
-package org.eclipse.epf.diagramming.base.commands;
-
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.draw2d.geometry.Rectangle;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.epf.diagramming.base.actions.ActionIds;
-import org.eclipse.epf.diagramming.edit.parts.ActivityPartitionEditPart;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.GraphicalEditPart;
-import org.eclipse.gmf.runtime.common.core.command.CommandResult;
-import org.eclipse.gmf.runtime.diagram.core.util.ViewUtil;
-import org.eclipse.gmf.runtime.emf.commands.core.command.AbstractTransactionalCommand;
-import org.eclipse.gmf.runtime.notation.NotationPackage;
-import org.eclipse.gmf.runtime.notation.View;
-
-/**
- * @author Shashidhar Kannoori
- *
- */
-public class OrientationCommand extends AbstractTransactionalCommand {
-
-	private String orientation;
-	private EditPart editPart;
-
-	/**
-	 * @param domain
-	 * @param label
-	 * @param affectedFiles
-	 */
-	public OrientationCommand(TransactionalEditingDomain domain, String label,
-			EditPart editPart, String orientation) {
-		
-		super(domain, "Orientation", getWorkspaceFiles(((View)editPart.getModel()).eContainer()));
-		this.orientation = orientation;
-		this.editPart = editPart;
-
-		setResult(CommandResult.newOKCommandResult(editPart.getModel()));
-	}
-
-	/**
-	 * @param domain
-	 * @param label
-	 * @param options
-	 * @param affectedFiles
-	 */
-	public OrientationCommand(TransactionalEditingDomain domain, String label,
-			Map options, List affectedFiles) {
-		super(domain, label, options, affectedFiles);
-		// TODO Auto-generated constructor stub
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.gmf.runtime.emf.commands.core.command.AbstractTransactionalCommand#doExecuteWithResult(org.eclipse.core.runtime.IProgressMonitor, org.eclipse.core.runtime.IAdaptable)
-	 */
-	protected CommandResult doExecuteWithResult(IProgressMonitor monitor,
-			IAdaptable info) throws ExecutionException {
-		if(orientation == ActionIds.ACTION_V_ORIENTATION){
-			GraphicalEditPart part = (GraphicalEditPart)editPart;
-			Rectangle bounds = part.getFigure().getBounds();
-			if (bounds != null) {
-				ViewUtil.setStructuralFeatureValue((View)part.getModel(),NotationPackage.eINSTANCE.getSize_Width(), new Integer(bounds.height));
-				ViewUtil.setStructuralFeatureValue((View)part.getModel(),NotationPackage.eINSTANCE.getSize_Height(), new Integer(bounds.width));
-			}
-		}
-		return CommandResult.newOKCommandResult();
-	}
-	
-	public boolean canExecute() {
-		if(editPart instanceof ActivityPartitionEditPart) 
-			return true;
-		else 
-			return false;
-	}
-}
diff --git a/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/base/figures/DecisionNodeFigure.java b/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/base/figures/DecisionNodeFigure.java
deleted file mode 100644
index 53ee138..0000000
--- a/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/base/figures/DecisionNodeFigure.java
+++ /dev/null
@@ -1,141 +0,0 @@
-//------------------------------------------------------------------------------
-// Copyright (c) 2005, 2007 IBM Corporation 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:
-// IBM Corporation - initial implementation
-//------------------------------------------------------------------------------
-/**
- * 
- */
-package org.eclipse.epf.diagramming.base.figures;
-
-import java.util.List;
-
-import org.eclipse.draw2d.Figure;
-import org.eclipse.draw2d.Graphics;
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.StackLayout;
-import org.eclipse.draw2d.geometry.Dimension;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.draw2d.geometry.PointList;
-import org.eclipse.draw2d.geometry.Rectangle;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.IPolygonAnchorableFigure;
-import org.eclipse.gmf.runtime.gef.ui.figures.DefaultSizeNodeFigure;
-
-/**
- * @author Shashidhar Kannoori
- * Adopted from GMF's GeoShapes
- */
-public class DecisionNodeFigure extends DefaultSizeNodeFigure implements
-		IPolygonAnchorableFigure {
-
-	private int spacing;
-
-	/**
-	 * Constructor create a decision figure
-	 * 
-	 */
-	public DecisionNodeFigure(int width, int height, int spacing) {
-		super(width, height);
-		this.spacing = spacing;
-		createFigure(width, height);
-	}
-	/**
-	 * @param defSize
-	 */
-	public DecisionNodeFigure(Dimension defSize) {
-		super(defSize);
-		// TODO Auto-generated constructor stub
-	}
-
-	/**
-	 * @param width
-	 * @param height
-	 */
-	public DecisionNodeFigure(int width, int height) {
-		super(width, height);
-		// TODO Auto-generated constructor stub
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.gmf.runtime.draw2d.ui.figures.IPolygonAnchorableFigure#getPolygonPoints()
-	 */
-	public PointList getPolygonPoints() {
-		// TODO Auto-generated method stub
-		return getPoints();
-	}
-	protected void paintFigure(Graphics g) {
-		PointList points = getPointList(getBounds().getCopy());
-		g.fillPolygon(points);
-		g.drawPolygon(points);
-	}
-	
-	/**
-	 * This method is used to compute the shapes polygon points.
-	 * This is currently based on the shapes bounding box.
-	 * 
-	 * @param rect the rectangle that the shape will fit in
-	 */
-	protected PointList getPointList(Rectangle rect) {
-		PointList points = new PointList();
-		
-		int halfX = rect.x + (rect.width / 2);
-		int halfY = rect.y + (rect.height / 2);
-		
-		Point p1 = new Point( halfX, rect.y );
-		Point p2 = new Point( rect.x + rect.width - 1, halfY );
-		Point p3 = new Point( halfX, rect.y + rect.height - 1 );
-		Point p4 = new Point( rect.x, halfY );
-		
-		points.addPoint( p1 );
-		points.addPoint( p2 );
-		points.addPoint( p3 );
-		points.addPoint( p4 );
-		points.addPoint( p1 );	
-		
-		return points;
-	}
-	
-	public IFigure getContentPane() {
-		return (IFigure) getChildren().get(0);
-	}
-	
-	public void createFigure(int width, int height){
-		setOpaque(true);
-		setLayoutManager(new StackLayout() {
-			public void layout(IFigure figure) {
-				Rectangle r = figure.getClientArea();
-				List children = figure.getChildren();
-				IFigure child;
-				Dimension d;
-				for (int i = 0; i < children.size(); i++) {
-					child = (IFigure)children.get(i);
-					d = child.getPreferredSize(r.width, r.height);
-					d.width = Math.min(d.width, r.width);
-					d.height = Math.min(d.height, r.height);
-					Rectangle childRect = new Rectangle(
-						r.x + (r.width - d.width)/2,
-						r.y + (r.height - d.height)/2,
-						d.width,
-						d.height);
-					child.setBounds(childRect);
-				}
-			}
-		});
-		
-		IFigure f = new Figure();
-		ConstrainedToolbarLayout layout = new ConstrainedToolbarLayout();
-		layout.setSpacing(spacing);
-		f.setLayoutManager(layout);
-		add(f);
-	}
-	
-	public PointList getPoints(){
-		return getPointList(getBounds().getCopy());
-	}
-}
diff --git a/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/base/figures/EndNodeFigure.java b/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/base/figures/EndNodeFigure.java
deleted file mode 100644
index 906b671..0000000
--- a/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/base/figures/EndNodeFigure.java
+++ /dev/null
@@ -1,61 +0,0 @@
-//------------------------------------------------------------------------------
-// Copyright (c) 2005, 2007 IBM Corporation 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:
-// IBM Corporation - initial implementation
-//------------------------------------------------------------------------------
-//------------------------------------------------------------------------------
-// Copyright (c) 2005, 2006 IBM Corporation 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:
-// IBM Corporation - initial implementation
-//------------------------------------------------------------------------------
-package org.eclipse.epf.diagramming.base.figures;
-
-import org.eclipse.draw2d.Ellipse;
-import org.eclipse.draw2d.Graphics;
-import org.eclipse.draw2d.geometry.Rectangle;
-
-/**
- * @author Phong Nguyen Le
- * @since 1.0
- */
-public class EndNodeFigure extends Ellipse {
-
-	/**
-	 * Fills the ellipse.
-	 * 
-	 * @see org.eclipse.draw2d.Shape#fillShape(org.eclipse.draw2d.Graphics)
-	 */
-	protected void fillShape(Graphics graphics) {
-		Rectangle r = getBounds().getCopy();
-		r.shrink(r.width / 8, r.height / 8);
-		graphics.fillOval(r);
-	}
-
-	/**
-	 * Outlines the ellipse.
-	 * 
-	 * @see org.eclipse.draw2d.Shape#outlineShape(org.eclipse.draw2d.Graphics)
-	 */
-	protected void outlineShape(Graphics graphics) {
-		super.outlineShape(graphics);
-
-		Rectangle r = Rectangle.SINGLETON;
-		r.setBounds(getBounds());
-		r.shrink(getBounds().width / 8, getBounds().height / 8);
-		r.width--;
-		r.height--;
-		r.shrink((lineWidth - 1) / 2, (lineWidth - 1) / 2);
-		graphics.drawOval(r);
-	}
-
-}
diff --git a/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/base/figures/ForkNodeFigure.java b/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/base/figures/ForkNodeFigure.java
deleted file mode 100644
index d983101..0000000
--- a/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/base/figures/ForkNodeFigure.java
+++ /dev/null
@@ -1,29 +0,0 @@
-//------------------------------------------------------------------------------
-// Copyright (c) 2005, 2007 IBM Corporation 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:
-// IBM Corporation - initial implementation
-//------------------------------------------------------------------------------
-/**
- * 
- */
-package org.eclipse.epf.diagramming.base.figures;
-
-import org.eclipse.draw2d.RectangleFigure;
-import org.eclipse.gmf.runtime.draw2d.ui.mapmode.MapModeUtil;
-
-/**
- * @author Shashidhar Kannoori
- *
- */
-public class ForkNodeFigure extends RectangleFigure {
-	
-	public void setSize(int w, int h) {
-		super.setSize(MapModeUtil.getMapMode().DPtoLP(100), 
-				MapModeUtil.getMapMode().DPtoLP(8));
-	}
-}
diff --git a/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/base/figures/RelativeXYAnchor.java b/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/base/figures/RelativeXYAnchor.java
deleted file mode 100644
index a974158..0000000
--- a/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/base/figures/RelativeXYAnchor.java
+++ /dev/null
@@ -1,61 +0,0 @@
-//------------------------------------------------------------------------------
-// Copyright (c) 2005, 2007 IBM Corporation 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:
-// IBM Corporation - initial implementation
-//------------------------------------------------------------------------------
-//------------------------------------------------------------------------------
-// Copyright (c) 2005, 2006 IBM Corporation 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:
-// IBM Corporation - initial implementation
-//------------------------------------------------------------------------------
-package org.eclipse.epf.diagramming.base.figures;
-
-import org.eclipse.draw2d.AbstractConnectionAnchor;
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.draw2d.geometry.Rectangle;
-
-/**
- * Provides relative anchor for a figure's location. 
- * 
- * @author Phong Nguyen Le
- * @since 1.0
- */
-public class RelativeXYAnchor extends AbstractConnectionAnchor {
-
-	private Point relativeLocation;
-
-	public RelativeXYAnchor(IFigure figure, Point location, boolean isRelative) {
-		super(figure);
-		relativeLocation = location.getCopy();
-	}
-
-	/**
-	 * @see org.eclipse.draw2d.ConnectionAnchor#getLocation(Point)
-	 */
-	public Point getLocation(Point reference) {
-		Point p = relativeLocation.getCopy();
-		Rectangle r = getOwner().getBounds().getCopy();
-		p.performTranslate(r.x, r.y);
-		getOwner().translateToAbsolute(p);
-		return p;
-	}
-
-	/**
-	 * @see org.eclipse.draw2d.AbstractConnectionAnchor#getReferencePoint()
-	 */
-	public Point getReferencePoint() {
-		return getLocation(null);
-	}
-
-}
diff --git a/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/base/parts/ActivityNodeEditPart.java b/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/base/parts/ActivityNodeEditPart.java
deleted file mode 100644
index b43a341..0000000
--- a/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/base/parts/ActivityNodeEditPart.java
+++ /dev/null
@@ -1,47 +0,0 @@
-//------------------------------------------------------------------------------
-// Copyright (c) 2005, 2007 IBM Corporation 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:
-// IBM Corporation - initial implementation
-//------------------------------------------------------------------------------
-/**
- * 
- */
-package org.eclipse.epf.diagramming.base.parts;
-
-import org.eclipse.epf.diagramming.base.policies.ActivityNodeResizableEditPolicy;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.ShapeNodeEditPart;
-import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;
-import org.eclipse.gmf.runtime.notation.View;
-
-/**
- * @author Shashidhar Kannoori
- *
- */
-public class ActivityNodeEditPart extends ShapeNodeEditPart {
-
-	/**
-	 * @param view
-	 */
-	public ActivityNodeEditPart(View view) {
-		super(view);
-		// TODO Auto-generated constructor stub
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.gmf.runtime.diagram.ui.editparts.ShapeNodeEditPart#createNodeFigure()
-	 */
-
-	protected NodeFigure createNodeFigure() {
-		// TODO Auto-generated method stub
-		return null;
-	}
-	public EditPolicy getPrimaryDragEditPolicy() {
-		return new ActivityNodeResizableEditPolicy();
-	}
-}
diff --git a/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/base/parts/DiagramFileEditorInput.java b/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/base/parts/DiagramFileEditorInput.java
deleted file mode 100644
index 2c33750..0000000
--- a/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/base/parts/DiagramFileEditorInput.java
+++ /dev/null
@@ -1,189 +0,0 @@
-//------------------------------------------------------------------------------
-// Copyright (c) 2005, 2007 IBM Corporation 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:
-// IBM Corporation - initial implementation
-//------------------------------------------------------------------------------
-/*******************************************************************************
- * Copyright (c) 2000, 2006 IBM Corporation 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:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.epf.diagramming.base.parts;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IStorage;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.content.IContentType;
-import org.eclipse.epf.diagram.core.part.DiagramEditorInput;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.ui.IFileEditorInput;
-import org.eclipse.ui.IMemento;
-import org.eclipse.ui.IPathEditorInput;
-import org.eclipse.ui.IPersistableElement;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.ide.IDE;
-import org.eclipse.ui.part.FileEditorInputFactory;
-
-/**
- * Adapter for making a file resource a suitable input for an editor.
- * <p>
- * This class may be instantiated; it is not intended to be subclassed.
- * </p>
- * @author Shashidhar Kannoori
- */
-public class DiagramFileEditorInput implements IFileEditorInput, IPathEditorInput,
-        IPersistableElement 
-        {
-	private DiagramEditorInput diagramEditorInput;
-    private IFile file;
-
-    /**
-     * Creates an editor input based of the given file resource.
-     *
-     * @param file the file resource
-     */
-    public DiagramFileEditorInput(IFile file, DiagramEditorInput diagramEditorInput) {
-        if (file == null) {
-            throw new IllegalArgumentException();
-        }
-        this.file = file;
-        this.diagramEditorInput = diagramEditorInput;
-    }
-
-    /* (non-Javadoc)
-     * Method declared on Object.
-     */
-    public int hashCode() {
-        return file.hashCode();
-    }
-
-    /* (non-Javadoc)
-     * Method declared on Object.
-     *
-     * The <code>DiagramFileEditorInput</code> implementation of this <code>Object</code>
-     * method bases the equality of two <code>DiagramFileEditorInput</code> objects on the
-     * equality of their underlying <code>IFile</code> resources.
-     */
-    public boolean equals(Object obj) {
-        if (this == obj) {
-			return true;
-		}
-        if (!(obj instanceof IFileEditorInput)) {
-			return false;
-		}
-        IFileEditorInput other = (IFileEditorInput) obj;
-        return file.equals(other.getFile());
-    }
-
-    /* (non-Javadoc)
-     * Method declared on IEditorInput.
-     */
-    public boolean exists() {
-        return file.exists();
-    }
-
-    /* (non-Javadoc)
-     * Method declared on IAdaptable.
-     */
-    public Object getAdapter(Class adapter) {
-        if (adapter == IFile.class) {
-			return file;
-		}
-        return file.getAdapter(adapter);
-    }
-
-    /* (non-Javadoc)
-     * Method declared on IPersistableElement.
-     */
-    public String getFactoryId() {
-        return FileEditorInputFactory.getFactoryId();
-    }
-
-    /* (non-Javadoc)
-     * Method declared on IDiagramFileEditorInput.
-     */
-    public IFile getFile() {
-        return file;
-    }
-
-    /* (non-Javadoc)
-     * Method declared on IEditorInput.
-     */
-    public ImageDescriptor getImageDescriptor() {
-        IContentType contentType = IDE.getContentType(file);
-		return PlatformUI.getWorkbench().getEditorRegistry()
-                .getImageDescriptor(file.getName(), contentType);
-    }
-
-    /* (non-Javadoc)
-     * Method declared on IEditorInput.
-     */
-    public String getName() {
-        return file.getName();
-    }
-
-    /* (non-Javadoc)
-     * Method declared on IEditorInput.
-     */
-    public IPersistableElement getPersistable() {
-        return this;
-    }
-
-    /* (non-Javadoc)
-     * Method declared on IStorageEditorInput.
-     */
-    public IStorage getStorage() throws CoreException {
-        return file;
-    }
-
-    /* (non-Javadoc)
-     * Method declared on IEditorInput.
-     */
-    public String getToolTipText() {
-        return file.getFullPath().makeRelative().toString();
-    }
-
-    /* (non-Javadoc)
-     * Method declared on IPersistableElement.
-     */
-    public void saveState(IMemento memento) {
-
-    }
-
-    /* (non-Javadoc)
-     * Method declared on IPathEditorInput
-     * @since 3.0
-     * @issue consider using an internal adapter for IPathEditorInput rather than adding this as API
-     */
-    public IPath getPath() {
-        return file.getLocation();
-    }
-    
-    /* (non-Javadoc)
-     * @see java.lang.Object#toString()
-     */
-    public String toString() {
-        return getClass().getName() + "(" + getFile().getFullPath() + ")"; //$NON-NLS-1$ //$NON-NLS-2$
-    }
-
-	public DiagramEditorInput getDiagramEditorInput() {
-		return diagramEditorInput;
-	}
-
-	public void setDiagramEditorInput(DiagramEditorInput diagramEditorInput) {
-		this.diagramEditorInput = diagramEditorInput;
-	}
-	
-}
-
diff --git a/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/base/parts/DiagramFileEditorInputFactory.java b/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/base/parts/DiagramFileEditorInputFactory.java
deleted file mode 100644
index ae15a2c..0000000
--- a/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/base/parts/DiagramFileEditorInputFactory.java
+++ /dev/null
@@ -1,115 +0,0 @@
-//------------------------------------------------------------------------------
-// Copyright (c) 2005, 2007 IBM Corporation 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:
-// IBM Corporation - initial implementation
-//------------------------------------------------------------------------------
-/**
- * 
- */
-package org.eclipse.epf.diagramming.base.parts;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.epf.diagram.core.part.DiagramEditorInput;
-import org.eclipse.epf.library.LibraryService;
-import org.eclipse.epf.library.edit.util.Suppression;
-import org.eclipse.epf.uma.Activity;
-import org.eclipse.epf.uma.CapabilityPattern;
-import org.eclipse.epf.uma.MethodElement;
-import org.eclipse.ui.IElementFactory;
-import org.eclipse.ui.IMemento;
-
-/**
- * Factory for saving and restoring a {@link DiagramFileEditorInput}. 
- * The stored representation of a {@link DiagramFileEditorInput} remembers
- * the full path of the file and {@link CapabilityPattern} or {@link Activity}'s
- * GUID.The workbench will automatically create instances of this class as required.
- * It is not intended to be instantiated or subclassed by the client.
- * </p>
- * @author Shashidhar Kannoori
- * @since 1.2
- */
-public class DiagramFileEditorInputFactory implements IElementFactory {
-
-	
-	 /**
-     * Factory id. The workbench plug-in registers a factory by this name
-     * with the "org.eclipse.ui.elementFactories" extension point.
-     */
-    private static final String ID_FACTORY = "org.eclipse.epf.diagramming.base.parts.DiagramFileEditorInputFactory"; //$NON-NLS-1$
-
-    /**
-     * Tag for the IFile.fullPath of the file resource.
-     */
-    private static final String TAG_PATH = "path"; //$NON-NLS-1$
-    
-    /**
-     * Tag for uma GUID
-     * 
-     */
-    private static final String TAG_GUID = "guid"; //$NON-NLS-1$
-	/**
-	 * 
-	 */
-	public DiagramFileEditorInputFactory() {
-		// TODO Auto-generated constructor stub
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.IElementFactory#createElement(org.eclipse.ui.IMemento)
-	 */
-	public IAdaptable createElement(IMemento memento) {
-		
-		  String fileName = memento.getString(TAG_PATH);
-	        if (fileName == null) {
-				return null;
-			}
-	        String guid = memento.getString(TAG_GUID);
-	        Suppression suppression = null;
-	        MethodElement element = LibraryService.getInstance().getCurrentLibraryManager().getMethodElement(guid);
-	        if(element instanceof Activity){
-	        	suppression = Suppression.getSuppression((org.eclipse.epf.uma.Process)((Activity)element).eContainer());
-	        }
-	        DiagramEditorInput input = new org.eclipse.epf.diagram.core.part.DiagramEditorInput(
-					element, suppression);
-
-	        // Get a handle to the IFile...which can be a handle
-	        // to a resource that does not exist in workspace
-	        IFile file = ResourcesPlugin.getWorkspace().getRoot().getFile(
-	                new Path(fileName));
-	        if (file != null) {
-				return new DiagramFileEditorInput(file,input );
-			} else {
-				return null;
-			}
-	}
-	
-	/**
-     * Returns the element factory id for this class.
-     * 
-     * @return the element factory id
-     */
-    public static String getFactoryId() {
-        return ID_FACTORY;
-    }
-
-    /**
-     * Saves the state of the given file editor input into the given memento.
-     *
-     * @param memento the storage area for element state
-     * @param input the file editor input
-     */
-    public static void saveState(IMemento memento, DiagramFileEditorInput input) {
-        IFile file = input.getFile();
-        memento.putString(TAG_PATH, file.getFullPath().toString());
-        memento.putString(TAG_GUID, input.getDiagramEditorInput().getMethodElement().getGuid());
-    }
-
-}
diff --git a/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/base/parts/DiagramHelper.java b/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/base/parts/DiagramHelper.java
deleted file mode 100644
index 2d110fb..0000000
--- a/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/base/parts/DiagramHelper.java
+++ /dev/null
@@ -1,144 +0,0 @@
-//------------------------------------------------------------------------------
-// Copyright (c) 2005, 2007 IBM Corporation 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:
-// IBM Corporation - initial implementation
-//------------------------------------------------------------------------------
-/**
- * 
- */
-package org.eclipse.epf.diagramming.base.parts;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.emf.transaction.impl.InternalTransactionalEditingDomain;
-import org.eclipse.epf.diagram.core.bridge.ActivityDiagramAdapter;
-import org.eclipse.epf.diagram.core.part.DiagramEditorInput;
-import org.eclipse.epf.diagram.core.part.DiagramFileEditorInputProxy;
-import org.eclipse.epf.diagramming.base.persistence.DiagramFileCreatorEx;
-import org.eclipse.epf.diagramming.base.persistence.DiagramPersister;
-import org.eclipse.epf.diagramming.base.persistence.DiagramService;
-import org.eclipse.epf.diagramming.base.persistence.IDiagramService;
-import org.eclipse.epf.library.edit.process.BreakdownElementWrapperItemProvider;
-import org.eclipse.epf.uma.Activity;
-import org.eclipse.epf.uma.MethodElement;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gmf.runtime.common.core.command.ICommand;
-import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.DiagramEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.parts.IDiagramWorkbenchPart;
-import org.eclipse.gmf.runtime.notation.Diagram;
-import org.eclipse.ui.IEditorDescriptor;
-import org.eclipse.ui.IEditorInput;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.IFileEditorInput;
-import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.ide.IDE;
-
-/**
- * Diagrm helper class (replacing the DiagramEditorUtil).
- * @author Shashidhar Kannoori
- *
- */
-public final class DiagramHelper {
-
-	/**
-	 * To open a diagram and create a file.
-	 * @written
-	 */
-	public static void openDiagramEditor(IWorkbenchPage page, IEditorInput input, String diagramKind){
-		
-		IProgressMonitor monitor = new NullProgressMonitor();
-		
-		MethodElement methodElement = (MethodElement)((DiagramEditorInput)input).getMethodElement();
-		Diagram diagram = IDiagramService.eInstance.getDiagram((Activity)methodElement, diagramKind, false, new NullProgressMonitor());
-		IFile diagramFile = DiagramPersister.getFile(input) ;
-		if(diagramFile == null){
-			diagramFile = DiagramPersister.createNewDiagramFile(DiagramFileCreatorEx.getInstance(), 
-					input, page.getWorkbenchWindow().getShell(), 
-					monitor);
-		}
-		if(diagram == null){
-			diagram = IDiagramService.eInstance.createDiagram((Activity)methodElement, diagramKind, false);
-			//TODO: remove this save option
-			try{
-				DiagramPersister.saveDiagram(IDiagramService.eInstance.createEditingDomain(), 
-					diagramFile, diagram, false);
-			}catch(Exception e){
-				e.printStackTrace();
-			}
-		}
-		
-		
-		DiagramFileEditorInputProxy diagramFileEditorInput = new DiagramFileEditorInputProxy(
-				diagramFile, (DiagramEditorInput)input, null);
-		
-		if (diagramFile != null) {
-			DiagramEditPart editPart = openEditor(diagramFileEditorInput, page, monitor, true, true);
-			initialize((Diagram) editPart.getModel(), diagramFileEditorInput);
-		}
-		
-	}
-	
-	private static final DiagramEditPart openEditor(IFileEditorInput input,
-			IWorkbenchPage page,IProgressMonitor progressMonitor, boolean activate, 
-			boolean determineContentType){
-		IEditorPart editorPart = null;
-		try {
-			//IWorkbenchPage page = dWindow.getActivePage();
-			IEditorPart parent = page.getActiveEditor();
-			if (page != null) {
-				 //sanity checks
-		        if (page == null) {
-					throw new IllegalArgumentException();
-				}
-
-		        // open the editor on the file
-		        IEditorDescriptor editorDesc = IDE.getEditorDescriptor(input.getFile(), determineContentType);
-		        editorPart =  page.openEditor(input, editorDesc.getId(),
-		                activate);
-				if(editorPart != null && parent != null){
-					// set the parent.
-				}
-			}
-			input.getFile().refreshLocal(IResource.DEPTH_ZERO, null);
-			return ((IDiagramWorkbenchPart) editorPart).getDiagramEditPart();
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-
-		return null;
-	}
-	
-	public static String getActivityDiagramKind(){
-		return DiagramService.AD_kind;
-	}
-	/**
-	 * 
-	 * @param model
-	 * @param diagramFileEditorInput
-	 */
-	private static void initialize(Diagram model, DiagramFileEditorInputProxy diagramFileEditorInput) {
-		BreakdownElementWrapperItemProvider wrapper = diagramFileEditorInput.getDiagramEditorInput().getWrapper();
-		ActivityDiagramAdapter adapter = wrapper != null ?
-				new ActivityDiagramAdapter(wrapper) : 
-					new ActivityDiagramAdapter((Activity)diagramFileEditorInput.getDiagramEditorInput().getMethodElement());
-		adapter.setEditingDomain((InternalTransactionalEditingDomain) diagramFileEditorInput.getEditingDomain());
-		adapter.setSuppression(diagramFileEditorInput.getDiagramEditorInput().getSuppression());
-		model.getElement().eAdapters().add(adapter);
-		adapter.populateDiagram();
-	}
-	
-	/**
-	 * @generated
-	 */
-	public static Command getCommandWrapper(ICommand cmd) {
-		return new ICommandProxy(cmd);
-	}
-}
diff --git a/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/base/persistence/DiagramFileCreatorEx.java b/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/base/persistence/DiagramFileCreatorEx.java
deleted file mode 100644
index 941d19f..0000000
--- a/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/base/persistence/DiagramFileCreatorEx.java
+++ /dev/null
@@ -1,51 +0,0 @@
-//------------------------------------------------------------------------------
-// Copyright (c) 2005, 2007 IBM Corporation 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:
-// IBM Corporation - initial implementation
-//------------------------------------------------------------------------------
-/*
- * Copyright (c) 2005, 2006 IBM Corporation 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:
- * IBM Corporation - initial implementation
- *
- */
-package org.eclipse.epf.diagramming.base.persistence;
-
-import org.eclipse.gmf.runtime.diagram.ui.resources.editor.util.DiagramFileCreator;
-
-/**
- * @author Shashidhar Kannoori
- */
-public class DiagramFileCreatorEx extends DiagramFileCreator {
-
-	public static final String default_diagram_file = "diagram"; 
-	/**
-	 * 
-	 */
-	private static DiagramFileCreatorEx INSTANCE = new DiagramFileCreatorEx();
-
-	/**
-	 * 
-	 */
-	public static DiagramFileCreatorEx getInstance() {
-		return INSTANCE;
-	}
-
-	/**
-	 * @generated
-	 */
-	public String getExtension() {
-		return ".xmi"; //$NON-NLS-1$
-	}
-
-}
\ No newline at end of file
diff --git a/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/base/persistence/DiagramPersister.java b/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/base/persistence/DiagramPersister.java
deleted file mode 100644
index 340777e..0000000
--- a/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/base/persistence/DiagramPersister.java
+++ /dev/null
@@ -1,1029 +0,0 @@
-//------------------------------------------------------------------------------
-// Copyright (c) 2005, 2007 IBM Corporation 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:
-// IBM Corporation - initial implementation
-//------------------------------------------------------------------------------
-/******************************************************************************
- * Copyright (c) 2005, 2007 IBM Corporation 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:
- *    IBM Corporation - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.epf.diagramming.base.persistence;
-
-import java.io.ByteArrayInputStream;
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStream;
-import java.lang.reflect.InvocationTargetException;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.commands.operations.OperationHistoryFactory;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IStorage;
-import org.eclipse.core.resources.IWorkspaceRoot;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.core.runtime.SubProgressMonitor;
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.ecore.xmi.FeatureNotFoundException;
-import org.eclipse.emf.ecore.xmi.PackageNotFoundException;
-import org.eclipse.emf.ecore.xmi.XMLResource;
-import org.eclipse.emf.transaction.Transaction;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.emf.transaction.impl.InternalTransaction;
-import org.eclipse.emf.transaction.impl.InternalTransactionalEditingDomain;
-import org.eclipse.epf.diagram.core.part.DiagramEditorInput;
-import org.eclipse.epf.diagram.core.part.DiagramFileEditorInputProxy;
-import org.eclipse.epf.diagramming.EPFDiagramPlugin;
-import org.eclipse.epf.diagramming.base.commands.CreateDiagramCommand;
-import org.eclipse.epf.diagramming.base.util.DiagramEditorUtil;
-import org.eclipse.epf.diagramming.base.util.UmaUmlUtil;
-import org.eclipse.epf.diagramming.part.EPFDiagramEditorPlugin;
-import org.eclipse.epf.library.LibraryService;
-import org.eclipse.epf.library.edit.util.TngUtil;
-import org.eclipse.epf.persistence.MethodLibraryPersister;
-import org.eclipse.epf.persistence.MultiFileSaveUtil;
-import org.eclipse.epf.uma.BreakdownElement;
-import org.eclipse.epf.uma.CapabilityPattern;
-import org.eclipse.epf.uma.DeliveryProcess;
-import org.eclipse.epf.uma.MethodElement;
-import org.eclipse.epf.uma.MethodPlugin;
-import org.eclipse.epf.uma.Process;
-import org.eclipse.epf.uma.util.UmaUtil;
-import org.eclipse.gmf.runtime.common.core.command.CommandResult;
-import org.eclipse.gmf.runtime.common.core.util.Log;
-import org.eclipse.gmf.runtime.diagram.core.services.ViewService;
-import org.eclipse.gmf.runtime.diagram.ui.resources.editor.util.DiagramFileCreator;
-import org.eclipse.gmf.runtime.emf.commands.core.command.AbstractTransactionalCommand;
-import org.eclipse.gmf.runtime.emf.core.resources.GMFResourceFactory;
-import org.eclipse.gmf.runtime.notation.Diagram;
-import org.eclipse.gmf.runtime.notation.util.NotationExtendedMetaData;
-import org.eclipse.jface.operation.IRunnableContext;
-import org.eclipse.jface.operation.IRunnableWithProgress;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.ui.IEditorInput;
-import org.eclipse.uml2.uml.Activity;
-import org.eclipse.uml2.uml.NamedElement;
-import org.eclipse.uml2.uml.UMLFactory;
-
-/**
- * Re-used {DiagramIOUtil} code and modify according for EPF and UML
- * Bridge. Persister helps in handling multi resource manipulation. 
- *  
- * @author Shashidhar Kannoori
- * @since 1.2
- */
-
-public class DiagramPersister {
-	private static final Map TX_OPTIONS = new HashMap();	
-    static {
-        TX_OPTIONS.put(Transaction.OPTION_NO_UNDO, Boolean.TRUE);
-        TX_OPTIONS.put(Transaction.OPTION_NO_NOTIFICATIONS, Boolean.TRUE);
-        TX_OPTIONS.put(Transaction.OPTION_NO_TRIGGERS, Boolean.TRUE);
-    }
-	
-    private static final Resource.Factory resourceFactory = new GMFResourceFactory();
-    
-	// localized labels
-	private static String UNABLE_TO_LOAD_DIAGRAM = "Unable to load diagram";
-
-	private static String NO_DIAGRAM_IN_RESOURCE = "No diagram resource";
-
-	private static interface ILoader {
-		public Resource load(TransactionalEditingDomain domain, Map loadOptions, IProgressMonitor monitor) throws IOException, CoreException;
-	}
-	
-	private static class FileLoader implements ILoader {
-		private IFile fFile;
-		public FileLoader(IFile file) {
-			//assert file != null;
-			fFile = file;
-		}
-		
-		public Resource load(TransactionalEditingDomain domain, Map loadOptions, IProgressMonitor monitor) throws IOException, CoreException {
-			fFile.refreshLocal(IResource.DEPTH_ZERO, monitor);
-			URI uri = URI.createPlatformResourceURI(fFile.getFullPath()
-                .toString(), true);
-			
-			Resource resource = domain.getResourceSet().getResource(uri, false);
-			
-			if (resource == null) {
-				resource = domain.getResourceSet().createResource(uri);
-			}
-			
-			if (!resource.isLoaded()) {
-				Map loadingOptions = new HashMap(GMFResourceFactory.getDefaultLoadOptions());
-				
-                // propogate passed in options to the defaults
-                Iterator iter = loadOptions.keySet().iterator();
-                while (iter.hasNext()) {
-                    Object key = iter.next();
-                    loadingOptions.put(key, loadOptions.get(key));
-                }
-                
-                try {
-                	resource.load(loadingOptions);
-                } catch (IOException e) {
-                	resource.unload();
-                	throw e;
-                }
-			}
-			
-			logResourceErrorsAndWarnings(resource);
-						
-			return resource;
-		}
-	}
-
-	private static void logResourceErrorsAndWarnings(Resource resource) {
-		for (Iterator iter = resource.getErrors().iterator(); iter.hasNext();) {
-			Resource.Diagnostic diagnostic = (Resource.Diagnostic) iter.next();
-			Log.error(EPFDiagramPlugin.getDefault(), 1, diagnostic.getMessage());				
-		}
-
-		for (Iterator iter = resource.getWarnings().iterator(); iter.hasNext();) {
-			Resource.Diagnostic diagnostic = (Resource.Diagnostic) iter.next();
-			Log.warning(EPFDiagramPlugin.getDefault(), 7, diagnostic.getMessage());				
-		}
-	}
-
-	
-	private static class StorageLoader implements ILoader {
-		private IStorage fStorage;
-		public StorageLoader(IStorage storage) {
-			//assert storage != null;
-			fStorage = storage;
-		}
-		
-		public Resource load(TransactionalEditingDomain editingDomain,
-				Map loadOptions, IProgressMonitor monitor)
-			throws IOException, CoreException {
-            String storageName = fStorage.getName();
-            URI uri = URI.createPlatformResourceURI(storageName);
-            Resource resource = editingDomain.getResourceSet().getResource(uri,false);
-            if (resource == null) {
-                resource = editingDomain.getResourceSet().createResource(uri);
-            }
-            if (!resource.isLoaded()) {
-                resource.load(fStorage.getContents(), loadOptions);
-            }
-			logResourceErrorsAndWarnings(resource);
-			return resource;
-		}
-	}
-	
-	static public Diagram load(final TransactionalEditingDomain domain, final IFile file, boolean bTryCompatible, IProgressMonitor monitor) throws CoreException {
-		FileLoader loader = new FileLoader(file);
-		return load(domain, loader, bTryCompatible, monitor);
-	}
-	
-	static public Diagram load(final TransactionalEditingDomain domain, final IStorage storage, boolean bTryCompatible, IProgressMonitor monitor,
-			IEditorInput input) throws CoreException {
-		ILoader loader = null;
-		if(storage instanceof IFile) {
-			loader = new FileLoader((IFile)storage);
-		} else {
-			loader = new StorageLoader(storage);
-		}
-		return load(domain, loader, bTryCompatible, monitor, input);
-	}
-	
-	static public Diagram load(final TransactionalEditingDomain domain, final IStorage storage, boolean bTryCompatible, IProgressMonitor monitor,
-			MethodElement me) throws CoreException {
-		ILoader loader = null;
-		if(storage instanceof IFile) {
-			loader = new FileLoader((IFile)storage);
-		} else {
-			loader = new StorageLoader(storage);
-		}
-		return load(domain, loader, bTryCompatible, monitor, me);
-	}
-	
-	/**
-	 * load an existing diagram file.
-	 * 
-	 * @param file
-	 * @return
-	 * @throws CoreException
-	 */
-	static private Diagram load(final TransactionalEditingDomain domain, final ILoader loader, boolean bTryCompatible, IProgressMonitor monitor) throws CoreException  {
-		Resource notationModel = null;
-		try {
-			try {	
-				// File exists with contents..
-				notationModel = loader.load(domain, new HashMap(), monitor);
-			} catch (Resource.IOWrappedException e) {
-				if (bTryCompatible) {
-					Throwable causeError = e.getCause();
-					
-					if (causeError == null) {
-						causeError = e;
-					}
-					
-					String errMsg = causeError.getLocalizedMessage();
-					if (causeError instanceof Resource.IOWrappedException) {
-						Exception exc = (Exception)((Resource.IOWrappedException) causeError)
-							.getCause();
-						if (exc != null) {
-							causeError = exc;
-						}
-					}
-					
-					if ((causeError instanceof PackageNotFoundException 
-							|| causeError instanceof ClassNotFoundException
-							|| causeError instanceof FeatureNotFoundException)) {
-						if (shouldLoadInCompatibilityMode(errMsg)) {
-                            Map loadOptions = new HashMap();
-            				
-                            // We will place a special extended metadata in here to ensure that we can load diagrams
-            				//  from older versions of our metamodel.
-            				loadOptions.put(XMLResource.OPTION_EXTENDED_META_DATA, new NotationExtendedMetaData());
-            				
-                            loadOptions.put(XMLResource.OPTION_RECORD_UNKNOWN_FEATURE, Boolean.TRUE);
-							notationModel = loader.load(domain, loadOptions, monitor);
-						} else {
-							// user does not want to load in compatibility mode.
-							return null; 
-						}
-					} else {
-                        throw e;
-					}
-				} else {
-					throw e;
-				}
-			}
-			if(notationModel == null)
-				throw new RuntimeException(UNABLE_TO_LOAD_DIAGRAM);
-
-			Iterator rootContents = notationModel.getContents().iterator();
-			while(rootContents.hasNext()) {
-				EObject rootElement = (EObject)rootContents.next();
-				if(rootElement instanceof Diagram)
-					return (Diagram)rootElement;
-			}
-			
-			throw new RuntimeException(NO_DIAGRAM_IN_RESOURCE);
-		} catch(Exception e) {
-			CoreException thrownExcp = null;
-			if(e instanceof CoreException) {
-				thrownExcp = (CoreException)e;
-            } else {
-                String exceptionMessage = e.getLocalizedMessage();
-                thrownExcp = new CoreException(new Status(IStatus.ERROR,
-                		EPFDiagramPlugin.getPluginId(), 1,
-                    exceptionMessage != null ? exceptionMessage
-                        : "load(IFile, boolean)", e)); //$NON-NLS-1$
-            }
-			throw thrownExcp;
-		}
-	}
-
-	/**
-	 * load an existing diagram file.
-	 * 
-	 * @param file
-	 * @return
-	 * @throws CoreException
-	 */
-	static private Diagram load(final TransactionalEditingDomain domain, final ILoader loader, boolean bTryCompatible, IProgressMonitor monitor,
-			IEditorInput input) throws CoreException  {
-		Resource notationModel = null;
-		try {
-			try {	
-				// File exists with contents..
-				notationModel = loader.load(domain, new HashMap(), monitor);
-			} catch (Resource.IOWrappedException e) {
-				if (bTryCompatible) {
-					Throwable causeError = e.getCause();
-					
-					if (causeError == null) {
-						causeError = e;
-					}
-					
-					String errMsg = causeError.getLocalizedMessage();
-					if (causeError instanceof Resource.IOWrappedException) {
-						Exception exc = (Exception)((Resource.IOWrappedException) causeError)
-							.getCause();
-						if (exc != null) {
-							causeError = exc;
-						}
-					}
-					
-					if ((causeError instanceof PackageNotFoundException 
-							|| causeError instanceof ClassNotFoundException
-							|| causeError instanceof FeatureNotFoundException)) {
-						if (shouldLoadInCompatibilityMode(errMsg)) {
-                            Map loadOptions = new HashMap();
-            				
-                            // We will place a special extended metadata in here to ensure that we can load diagrams
-            				//  from older versions of our metamodel.
-            				loadOptions.put(XMLResource.OPTION_EXTENDED_META_DATA, new NotationExtendedMetaData());
-            				
-                            loadOptions.put(XMLResource.OPTION_RECORD_UNKNOWN_FEATURE, Boolean.TRUE);
-							notationModel = loader.load(domain, loadOptions, monitor);
-						} else {
-							// user does not want to load in compatibility mode.
-							return null; 
-						}
-					} else {
-                        throw e;
-					}
-				} else {
-					throw e;
-				}
-			}
-			if(notationModel == null)
-				throw new RuntimeException(UNABLE_TO_LOAD_DIAGRAM);
-
-			//FileEditorInputProxy proxy = (FileEditorInputProxy)input;
-			DiagramFileEditorInputProxy fileInput = (DiagramFileEditorInputProxy)input;
-			DiagramEditorInput diagramInput = fileInput.getDiagramEditorInput();
-			
-			Object inputElement = diagramInput.getMethodElement();
-			
-			Diagram ad = null;
-			Iterator rootContents = notationModel.getContents().iterator();
-			find_ad:
-			while(rootContents.hasNext()) {
-				EObject rootElement = (EObject)rootContents.next();
-				
-				if(rootElement instanceof Diagram){
-					Diagram diagram = (Diagram)rootElement;
-					EObject diagramElement = diagram.getElement();
-					//TODO: can this method handle with other types of diagram???
-					if(DiagramService.AD_kind.equals(diagram.getType()) && diagramElement instanceof Activity){
-						MethodElement element = UmaUmlUtil.getUmaElement((NamedElement)diagramElement);
-						if(inputElement == element){
-							ad = diagram;
-							break find_ad;
-						}
-					}
-				}
-			}
-			if(ad != null) {
-				
-				// diagram found, remove all other diagrams and their sematic models from the resource
-				//
-//				List toRemove = new ArrayList();
-//				for (Iterator iter = notationModel.getContents().iterator(); iter.hasNext();) {
-//					Object element = (Object) iter.next();
-//					if(element != ad && element != ad.getElement()) {
-//						toRemove.add(element);
-//					}					
-//				}
-//				
-//				if(!toRemove.isEmpty()) {
-//					InternalTransactionalEditingDomain internalDomain = ((InternalTransactionalEditingDomain)domain);
-//					InternalTransaction tx = internalDomain.getActiveTransaction();
-//					if(tx == null) {
-//						tx = internalDomain.startTransaction(false, Collections.EMPTY_MAP);
-//					}
-//					else if(!tx.isActive()) {		
-//						tx.start();
-//					}
-//					notationModel.getContents().removeAll(toRemove);
-//					
-//					tx.commit();
-//				}
-				
-//				Resource resource = domain.createResource(notationModel.getURI());
-//				resource.getContents().clear();
-//				resource.getContents().add(ad.getElement());
-//				resource.getContents().add(ad);
-				
-				
-				return ad;
-			}
-			
-			//TODO: remove the dependency on DiagramEditorUtil.
-			boolean ok =DiagramEditorUtil.createDiagramContent(domain,
-					fileInput.getFile(), new NullProgressMonitor(), diagramInput, notationModel);
-			if(ok){
-				//unload(domain, diagram)
-				return load(domain, loader, bTryCompatible, monitor, input);
-			}
-				
-			
-			throw new RuntimeException(NO_DIAGRAM_IN_RESOURCE);
-		} catch(Exception e) {
-			CoreException thrownExcp = null;
-			if(e instanceof CoreException) {
-				thrownExcp = (CoreException)e;
-            } else {
-                String exceptionMessage = e.getLocalizedMessage();
-                thrownExcp = new CoreException(new Status(IStatus.ERROR,
-                    EPFDiagramPlugin.getPluginId(), 1,
-                    exceptionMessage != null ? exceptionMessage
-                        : "load(IFile, boolean)", e)); //$NON-NLS-1$
-            }
-			throw thrownExcp;
-		}
-	}
-	
-	
-	/**
-	 * load an existing diagram file.
-	 * 
-	 * @param file
-	 * @return
-	 * @throws CoreException
-	 */
-	static private Diagram load(final TransactionalEditingDomain domain, final ILoader loader, boolean bTryCompatible, IProgressMonitor monitor,
-			MethodElement me) throws CoreException  {
-		Resource notationModel = null;
-		try {
-			try {	
-				// File exists with contents..
-				notationModel = loader.load(domain, new HashMap(), monitor);
-			} catch (Resource.IOWrappedException e) {
-				if (bTryCompatible) {
-					Throwable causeError = e.getCause();
-					
-					if (causeError == null) {
-						causeError = e;
-					}
-					
-					String errMsg = causeError.getLocalizedMessage();
-					if (causeError instanceof Resource.IOWrappedException) {
-						Exception exc = (Exception)((Resource.IOWrappedException) causeError)
-							.getCause();
-						if (exc != null) {
-							causeError = exc;
-						}
-					}
-					
-					if ((causeError instanceof PackageNotFoundException 
-							|| causeError instanceof ClassNotFoundException
-							|| causeError instanceof FeatureNotFoundException)) {
-						if (shouldLoadInCompatibilityMode(errMsg)) {
-                            Map loadOptions = new HashMap();
-            				
-                            // We will place a special extended metadata in here to ensure that we can load diagrams
-            				//  from older versions of our metamodel.
-            				loadOptions.put(XMLResource.OPTION_EXTENDED_META_DATA, new NotationExtendedMetaData());
-            				
-                            loadOptions.put(XMLResource.OPTION_RECORD_UNKNOWN_FEATURE, Boolean.TRUE);
-							notationModel = loader.load(domain, loadOptions, monitor);
-						} else {
-							// user does not want to load in compatibility mode.
-							return null; 
-						}
-					} else {
-                        throw e;
-					}
-				} else {
-					throw e;
-				}
-			}
-			if(notationModel == null)
-				throw new RuntimeException(UNABLE_TO_LOAD_DIAGRAM);
-
-			Iterator rootContents = notationModel.getContents().iterator();
-			while(rootContents.hasNext()) {
-				EObject rootElement = (EObject)rootContents.next();
-				
-				if(rootElement instanceof Diagram){
-					Diagram diagram = (Diagram)rootElement;
-					EObject diagramElement = diagram.getElement();
-					if(diagramElement instanceof Activity){
-						MethodElement element = UmaUmlUtil.getUmaElement((NamedElement)diagramElement);
-
-						if(me == element){
-							return diagram;
-						}
-					}
-				}
-			}
-			return null;
-			
-		} catch(Exception e) {
-			CoreException thrownExcp = null;
-			if(e instanceof CoreException) {
-				thrownExcp = (CoreException)e;
-            } else {
-                String exceptionMessage = e.getLocalizedMessage();
-                thrownExcp = new CoreException(new Status(IStatus.ERROR,
-                    EPFDiagramPlugin.getPluginId(), 1,
-                    exceptionMessage != null ? exceptionMessage
-                        : "load(IFile, boolean)", e)); //$NON-NLS-1$
-            }
-			throw thrownExcp;
-		}
-	}
-	
-	
-	/**
-	 * 
-	 * @param domain
-	 * @param file
-	 * @param diagram
-	 * @param bKeepUnrecognizedData
-	 * @param progressMonitor
-	 * @throws CoreException
-	 */
-	
-	static public void save(TransactionalEditingDomain domain, IFile file, Diagram diagram, boolean bKeepUnrecognizedData, IProgressMonitor progressMonitor) throws CoreException {
-        Map options = new HashMap();
-		if(bKeepUnrecognizedData)
-            options.put(XMLResource.OPTION_RECORD_UNKNOWN_FEATURE, Boolean.TRUE);
-        save(domain, file, diagram, progressMonitor, options);
-	}
-    
-    static public void save(TransactionalEditingDomain domain, IFile file, Diagram diagram, IProgressMonitor progressMonitor) throws CoreException {
-        Map options = new HashMap();
-        save(domain, file, diagram, progressMonitor, options);
-    }
-    
-    private static List getOtherDiagramObjects(Resource resource, String actGuid) {
-		ArrayList list = new ArrayList();
-		for (Iterator iter = resource.getContents().iterator(); iter.hasNext();) {
-			Object element = (Object) iter.next();
-			if(element instanceof Activity) {
-				if(!actGuid.equals(UmaUmlUtil.getUmaGuidFromUmlElement((NamedElement) element))) {
-					list.add(element);
-				}
-			}
-			else if(element instanceof Diagram) {
-				Object e = ((Diagram)element).getElement();
-				if(e instanceof Activity) { 
-					if(!actGuid.equals(UmaUmlUtil.getUmaGuidFromUmlElement((NamedElement) e))) {
-						list.add(element);
-					}						
-				}
-				else {
-					list.add(element);
-				}
-			}
-			else {
-				list.add(element);
-			}
-		}
-		return list;
-    }
-	
-	static public void save(TransactionalEditingDomain domain, IFile file, Diagram diagram, IProgressMonitor progressMonitor, Map options) throws CoreException {
-		Resource notationModel = ((EObject) diagram).eResource();
-		String actGuid = UmaUmlUtil.getUmaGuidFromUmlElement((NamedElement) diagram.getElement());
-		
-		// The current resource contains only current diagram
-		// So load diagram file and add other diagrams to the current resource before saving it
-		//
-		Resource resource = resourceFactory.createResource(URI.createPlatformResourceURI(file.getFullPath().toString()));
-		try {
-			Transaction tx = ((InternalTransactionalEditingDomain)domain).startTransaction(false, TX_OPTIONS);
-			resource.load(Collections.EMPTY_MAP);	
-			List newList = getOtherDiagramObjects(resource, actGuid);
-			List oldList = getOtherDiagramObjects(notationModel, actGuid);
-			notationModel.getContents().removeAll(oldList);
-			notationModel.getContents().addAll(newList);
-			tx.commit();
-		} catch (Exception e1) {
-			// TODO Auto-generated catch block
-			e1.printStackTrace();
-		}		
-		
-		String fileName = file.getFullPath().toOSString();
-		notationModel.setURI(URI.createPlatformResourceURI(fileName, true));
-		try {
-			notationModel.save(options);
-		} catch (IOException e) {
-			throw new CoreException(new Status(IStatus.ERROR, EPFDiagramPlugin
-				.getPluginId(), 5, e
-				.getLocalizedMessage(), null));
-		}
-
-		if (progressMonitor != null)
-			progressMonitor.done();
-		
-		logResourceErrorsAndWarnings(notationModel);
-	}
-	
-	/**
-	 * Temp method will be removed later.
-	 * @param domain
-	 * @param file
-	 * @param diagram
-	 * @param progressMonitor
-	 * @param save
-	 * @throws CoreException
-	 */
-	static public void save(TransactionalEditingDomain domain, IFile file, Diagram diagram, 
-			IProgressMonitor progressMonitor, boolean save) throws CoreException {
-        Map options = new HashMap();
-		Resource notationModel = ((EObject) diagram).eResource();
-		if(notationModel == null){
-				URI uri = URI.createPlatformResourceURI(file.getFullPath()
-	                .toOSString(), true);
-				
-				notationModel = domain.getResourceSet().getResource(uri, false);
-				if (notationModel == null) {
-					notationModel = domain.getResourceSet().createResource(uri);
-				}
-				notationModel.getContents().add(diagram.getElement());
-				notationModel.getContents().add(diagram);
-		}else{
-			String fileName = file.getFullPath().toOSString();
-			notationModel.setURI(URI.createPlatformResourceURI(fileName, true));
-		}
-		
-		try {
-			notationModel.save(options);
-		} catch (IOException e) {
-			throw new CoreException(new Status(IStatus.ERROR, EPFDiagramPlugin
-				.getPluginId(), 5, e
-				.getLocalizedMessage(), null));
-		}
-
-		if (progressMonitor != null)
-			progressMonitor.done();
-		
-		logResourceErrorsAndWarnings(notationModel);
-	}
-	
-	
-		/**
-	 * @param errMsg
-	 * @return
-	 */
-	private static boolean shouldLoadInCompatibilityMode(String errMsg) {
-		// no compatibility support at present
-		return false;
-	}
-	
-	public static void unload(TransactionalEditingDomain domain, Diagram diagram) {
-		diagram.eResource().unload();
-	}
-
-	public static boolean hasUnrecognizedData(Resource resource) {
-		// no compatibility support at present
-		return false;
-	}
-	
-	public static IFile getFile(IEditorInput input){
-		return getFile(DiagramFileCreatorEx.default_diagram_file, input,
-				DiagramFileCreatorEx.getInstance());
-	}
-	
-	/**
-	 * Check whether file exists or not.
-	 * @param szFileName
-	 * @param input
-	 * @param diagramFileCreator
-	 * @return
-	 */
-	public static IFile getFile(String szFileName, IEditorInput input,
-			DiagramFileCreator diagramFileCreator) {
-
-		MethodElement e = ((DiagramEditorInput) input).getMethodElement();
-		Process srcProc = TngUtil.getOwningProcess((BreakdownElement) e);
-
-		IPath containerPath = getContainerPath(e);
-		String szNewFileName = szFileName;
-		IPath filePath = containerPath.append(diagramFileCreator
-				.appendExtensionToFileName(szNewFileName));
-		File libDirs = new File(LibraryService.getInstance()
-				.getCurrentMethodLibraryPath());
-		String diagramPath = libDirs.getAbsolutePath() + File.separator
-				+ MethodLibraryPersister.getElementPath(srcProc)
-				+ File.separator + srcProc.getName() + File.separator
-				+ "diagram.xmi";
-		File filex = new File(diagramPath);
-		if (filex.exists()) {
-			return ResourcesPlugin.getWorkspace().getRoot().getFile(filePath);
-		}
-		return null;
-	}
-	/**
-	 * @written
-	 */
-	public static IPath getContainerPath(){
-		IPath path = null;
-		if (path == null) {
-				IWorkspaceRoot root = ResourcesPlugin.getWorkspace().getRoot();
-				IProject[] projects = root.getProjects();
-
-				path = root.getFullPath();
-
-				for (int i = 0; i < projects.length; ++i) {
-					IProject project = projects[i];
-
-					if (project.isOpen()) {
-						path = project.getFullPath();
-						break;
-					}
-				}
-		}
-		return path;
-	}
-	
-	/**
-	 * 
-	 * 
-	 * @param proc
-	 * @return
-	 * @custom
-	 */
-	public static IPath getContainerPath(MethodElement e) {
-
-		Process proc = TngUtil.getOwningProcess(e);
-		// TODO handle the Wrapper Elements.
-		
-		if (proc instanceof Process) {
-			MethodPlugin plugin = UmaUtil.getMethodPlugin(proc);
-
-			String relativeDir;
-
-			if (proc instanceof CapabilityPattern) {
-				relativeDir = MultiFileSaveUtil.CAPABILITY_PATTERN_PATH;
-			} else if (proc instanceof DeliveryProcess) {
-				relativeDir = MultiFileSaveUtil.DELIVERY_PROCESS_PATH;
-			} else {
-				relativeDir = ""; //$NON-NLS-1$
-			}
-
-			IPath workspacePath = null;
-			if (workspacePath == null) {
-				IWorkspaceRoot root = ResourcesPlugin.getWorkspace().getRoot();
-				IProject[] projects = root.getProjects();
-
-				workspacePath = root.getFullPath();
-
-				for (int i = 0; i < projects.length; ++i) {
-					IProject project = projects[i];
-
-					if (project.isOpen()) {
-						workspacePath = project.getFullPath();
-						break;
-					}
-				}
-			}
-
-			String libDir = workspacePath.toString();
-			String pluginDir = libDir + File.separator + plugin.getName();
-			String diagramDir = pluginDir + File.separator + relativeDir
-					+ File.separator + proc.getName() + File.separator;
-			//System.out.println("Print: " + diagramDir);
-			Path path = new Path(diagramDir);
-			return path;
-
-			//	 return workspacePath;
-		} else
-			return null;
-	} 
-	
-	/**
-	 * Check whether file exists or not.
-	 * 
-	 * @param szFileName
-	 * @param input
-	 * @param diagramFileCreator
-	 * @return
-	 */
-	public static IFile getFile(String szFileName, BreakdownElement e,
-			DiagramFileCreator diagramFileCreator) {
-
-		Process srcProc = TngUtil.getOwningProcess((BreakdownElement) e);
-
-		IPath containerPath = getContainerPath(e);
-		String szNewFileName = szFileName;
-		IPath filePath = containerPath.append(diagramFileCreator
-				.appendExtensionToFileName(szNewFileName));
-		File libDirs = new File(LibraryService.getInstance()
-				.getCurrentMethodLibraryPath());
-		String diagramPath = libDirs.getAbsolutePath() + File.separator
-				+ MethodLibraryPersister.getElementPath(srcProc)
-				+ File.separator + srcProc.getName() + File.separator
-				+ "diagram.xmi";
-		File filex = new File(diagramPath);
-		if (filex.exists()) {
-			return ResourcesPlugin.getWorkspace().getRoot().getFile(filePath);
-		}
-		return null;
-	}
-	
-	
-	/**
-	 * 
-	 * 
-	 * Creates a diagram file content - GMF notation Diagram and UML Activity,
-	 * UMA bridge. TODO: remove the dependency on command.
-	 * @deprecated
-	 */
-	public static boolean createDiagramContent(
-			TransactionalEditingDomain editingDomain, IFile diagramFile,
-			IProgressMonitor progressMonitor, IEditorInput input,
-			Resource resource, String kind) {
-
-		List affectedFiles = new ArrayList();
-		affectedFiles.add(diagramFile);
-		CreateDiagramCommand command = new CreateDiagramCommand(editingDomain,
-				CreateDiagramCommand.COMMAND_LABEL, affectedFiles, input,
-				resource, kind);
-		try {
-			OperationHistoryFactory.getOperationHistory().execute(command,
-					new SubProgressMonitor(progressMonitor, 1), null);
-		} catch (ExecutionException e) {
-			EPFDiagramEditorPlugin.getInstance().logError(
-					"Unable to create model and diagram", e); //$NON-NLS-1$
-			return false;
-		}
-		return true;
-	}
-	
-	/**
-	 * 
-	 */
-	public static Diagram createDiagram(TransactionalEditingDomain editingDomain, 
-			String diagramKind, BreakdownElement me, boolean save) {
-		IFile diagramFile = getFile(DiagramFileCreatorEx.default_diagram_file, (BreakdownElement)me, 
-				DiagramFileCreatorEx.getInstance());	
-		
-		final Resource diagramResource = editingDomain.getResourceSet()
-				.createResource(URI.createPlatformResourceURI(diagramFile
-						.getFullPath().toString()));
-		List affectedFiles = new ArrayList();
-		affectedFiles.add(diagramFile);
-
-		final String kindParam = diagramKind;
-		final MethodElement methodElement = me;
-		final boolean saveDiagram = save;
-		AbstractTransactionalCommand command = new AbstractTransactionalCommand(
-				editingDomain, "Creating diagram and model", affectedFiles) { //$NON-NLS-1$
-			Diagram diagram = null;
-			protected CommandResult doExecuteWithResult(
-					IProgressMonitor monitor, IAdaptable info)
-					throws ExecutionException {
-				Activity model = UMLFactory.eINSTANCE.createActivity();
-				diagramResource.getContents().add(model);
-				diagram = ViewService.createDiagram(model, kindParam,
-						EPFDiagramEditorPlugin.DIAGRAM_PREFERENCES_HINT);
-				if (diagram != null) {
-					if(methodElement != null && methodElement instanceof org.eclipse.epf.uma.Activity){
-						UmaUmlUtil.createEAnnotationForUml(model, methodElement.getGuid());
-					}
-					diagramResource.getContents().add(diagram);
-					diagram.setName(methodElement.getName());
-					diagram.setElement(model);
-					model.setName(methodElement.getName());
-				}
-				// Enable below if we have to store the diagram immediately.
-				if (saveDiagram) {
-					try {
-						 diagramResource.save(Collections.EMPTY_MAP);
-					} catch (IOException e) {
-						System.out
-								.println("Unable to store model and diagram resources"
-										+ e.getMessage());
-					}
-				}
-				return CommandResult.newOKCommandResult(diagram);
-			}
-		};
-
-		try {
-			OperationHistoryFactory.getOperationHistory().execute(command,
-					new SubProgressMonitor(new NullProgressMonitor(), 1), null);
-		} catch (ExecutionException e) {
-				System.out.println("Error: Unable to create model and diagram" + e.getMessage());
-		}
-
-		try {
-			diagramFile.setCharset(
-					"UTF-8", new SubProgressMonitor(new NullProgressMonitor(), 1)); //$NON-NLS-1$
-		} catch (CoreException e) {
-			System.out.println("Error: Unable to set charset for diagram file "+  e.getLocalizedMessage()); //$NON-NLS-1$
-		}
-		return (Diagram)command.getCommandResult().getReturnValue();
-	}
-	
-	
-	/**
-	 * 
-	 * @
-	 */
-	public static Diagram saveDiagram(TransactionalEditingDomain editingDomain, IFile diagramFile, 
-			Diagram diagram, boolean save) {
-		
-		Resource notationModel = ((EObject) diagram).eResource();
-		if(notationModel == null){
-				URI uri = URI.createPlatformResourceURI(diagramFile.getFullPath()
-	                .toOSString(), true);
-				
-				notationModel = editingDomain.getResourceSet().getResource(uri, false);
-				if (notationModel == null) {
-					notationModel = editingDomain.getResourceSet().createResource(uri);
-				}
-		}
-		final Resource diagramResource = notationModel;
-		List affectedFiles = new ArrayList();
-		affectedFiles.add(diagramFile);
-		final Diagram saveDiagram = diagram;
-		AbstractTransactionalCommand command = new AbstractTransactionalCommand(
-				editingDomain, "Saving diagram and model", affectedFiles) { //$NON-NLS-1$
-			protected CommandResult doExecuteWithResult(
-					IProgressMonitor monitor, IAdaptable info)
-					throws ExecutionException {
-				diagramResource.getContents().add(saveDiagram.getElement());
-				diagramResource.getContents().add(saveDiagram);
-				try {
-					 diagramResource.save(Collections.EMPTY_MAP);
-				} catch (IOException e) {
-					System.out
-							.println("Unable to store model and diagram resources"
-									+ e.getMessage());
-				}
-				return CommandResult.newOKCommandResult(saveDiagram);
-			}
-		};
-
-		try {
-			OperationHistoryFactory.getOperationHistory().execute(command,
-					new SubProgressMonitor(new NullProgressMonitor(), 1), null);
-		} catch (ExecutionException e) {
-				System.out.println("Error: Unable to create model and diagram" + e.getMessage());
-		}
-
-		try {
-			diagramFile.setCharset(
-					"UTF-8", new SubProgressMonitor(new NullProgressMonitor(), 1)); //$NON-NLS-1$
-		} catch (CoreException e) {
-			System.out.println("Error: Unable to set charset for diagram file "+  e.getLocalizedMessage()); //$NON-NLS-1$
-		}
-		return (Diagram)command.getCommandResult().getReturnValue();
-	}
-	
-	/**
-	 * Method getInitialContents. Gets the initial contents of the UML
-	 * Visualizer diagram file. Currently it returns an empty byte stream.
-	 *
-	 * @return Byte stream that will initially populate the UML
-	 *         Visualizer diagram file.
-	 */
-	public static InputStream getInitialContents() {
-		return new ByteArrayInputStream(new byte[0]);
-	}
-	
-	
-	/**
-	 * <p>
-	 * This method should be called within a workspace modify operation since it creates resources.
-	 * </p>
-	 * @modified
-	 * @return the created file resource, or <code>null</code> if the file was not created
-	 */
-	public static final IFile createNewDiagramFile(
-			DiagramFileCreatorEx diagramFileCreator, IEditorInput input, 
-			Shell shell, IProgressMonitor progressMonitor ) {
-		
-		MethodElement element = ((DiagramEditorInput)input).getMethodElement();
-		final IPath containerPath = getContainerPath(element);
-		final String diagramFileName = DiagramFileCreatorEx.default_diagram_file;
-		progressMonitor.beginTask("Creating notation diagram and model file", 4); //$NON-NLS-1$
-		final IProgressMonitor subProgressMonitor = new SubProgressMonitor(
-				progressMonitor, 1);
-		final IFile diagramFile = diagramFileCreator.createNewFile(
-				containerPath, diagramFileName, 
-				getInitialContents(), shell,
-				new IRunnableContext() {
-					public void run(boolean fork, boolean cancelable,
-							IRunnableWithProgress runnable)
-							throws InvocationTargetException,
-							InterruptedException {
-						runnable.run(subProgressMonitor);
-					}
-				});
-		
-		//createDiagramContent(diagramFile, progressMonitor, input);
-		progressMonitor.done();
-		return diagramFile;
-	}
-}
-
diff --git a/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/base/persistence/DiagramService.java b/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/base/persistence/DiagramService.java
deleted file mode 100644
index 1f1a441..0000000
--- a/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/base/persistence/DiagramService.java
+++ /dev/null
@@ -1,662 +0,0 @@
-//------------------------------------------------------------------------------
-// Copyright (c) 2005, 2007 IBM Corporation 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:
-// IBM Corporation - initial implementation
-//------------------------------------------------------------------------------
-/**
- * 
- */
-package org.eclipse.epf.diagramming.base.persistence;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.IdentityHashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EModelElement;
-import org.eclipse.emf.ecore.ENamedElement;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EReference;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.ecore.util.EcoreUtil;
-import org.eclipse.emf.ecore.util.InternalEList;
-import org.eclipse.emf.ecore.util.EcoreUtil.Copier;
-import org.eclipse.emf.transaction.Transaction;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.emf.transaction.util.TransactionUtil;
-import org.eclipse.emf.workspace.AbstractEMFOperation;
-import org.eclipse.epf.diagram.core.bridge.BridgeHelper;
-import org.eclipse.epf.diagram.core.services.DiagramManager;
-import org.eclipse.epf.diagramming.base.util.UmaUmlUtil;
-import org.eclipse.epf.library.edit.util.ProcessUtil;
-import org.eclipse.epf.uma.Activity;
-import org.eclipse.epf.uma.MethodElement;
-import org.eclipse.epf.uma.UmaPackage;
-import org.eclipse.epf.uma.VariabilityElement;
-import org.eclipse.epf.uma.VariabilityType;
-import org.eclipse.epf.uma.WorkOrder;
-import org.eclipse.gmf.runtime.common.core.util.StringStatics;
-import org.eclipse.gmf.runtime.diagram.core.DiagramEditingDomainFactory;
-import org.eclipse.gmf.runtime.diagram.core.preferences.PreferencesHint;
-import org.eclipse.gmf.runtime.diagram.core.services.ViewService;
-import org.eclipse.gmf.runtime.diagram.core.util.ViewType;
-import org.eclipse.gmf.runtime.emf.core.util.EMFCoreUtil;
-import org.eclipse.gmf.runtime.notation.Diagram;
-import org.eclipse.gmf.runtime.notation.Edge;
-import org.eclipse.gmf.runtime.notation.Node;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.uml2.uml.ActivityNode;
-import org.eclipse.uml2.uml.ControlNode;
-import org.eclipse.uml2.uml.NamedElement;
-import org.eclipse.uml2.uml.ObjectNode;
-import org.eclipse.uml2.uml.StructuredActivityNode;
-import org.eclipse.uml2.uml.UMLFactory;
-import org.eclipse.uml2.uml.UMLPackage;
-
-
-/**
- * Diagram service does diagram data specific work requested by clients.
- * @author Shashidhar Kannoori
- * @since 1.2
- */
-public class DiagramService implements IDiagramService {
-
-	public static final String ID = "org.eclipse.epf.diagramming";
-	public static final String EDITING_DOMIAN_ID = "org.eclipse.epf.diagramming.EditingDomain"; //$NON-NLS-1$
-	
-	public static final String AD_kind = DiagramManager.AD_kind;
-	public static final String ADD_kind = DiagramManager.ADD_kind;
-	public static final String WPD_kind = DiagramManager.WPD_kind;	
-	
-	static final int[] DIAGRAM_TYPES = { ACTIVITY_DIAGRAM, WORK_PRODUCT_DEPENDENCY_DIAGRAM, ACTIVITY_DETAIL_DIAGRAM };
-	
-	static final String[] DIAGRAM_KINDS = new String[]{AD_kind, WPD_kind, ADD_kind};
-
-	public boolean debug = false;
-	
-	/**
-	 * @generated
-	 */
-	public static final PreferencesHint DIAGRAM_PREFERENCES_HINT = new PreferencesHint(
-			ID);
-	
-	protected static DiagramService instance = new DiagramService();
-	protected List dispatchers = new ArrayList();
-	
-	/**
-	 * 
-	 */
-	public DiagramService() {
-		// TODO Auto-generated constructor stub
-	}
-
-	public static DiagramService eInstance(){
-		return instance;
-	}
-	
-	
-	/**
-	 * Adds a dispatchers to monitor Library Service events.
-	 * 
-	 * @param dispatchers
-	 *            a diagram service dispatchers
-	 */
-	public void addDispatchers(ISaveEventDispatcher dispatcher) {
-		dispatchers.add(dispatcher);
-	}
-
-	/**
-	 * Removes a dispatchers that was added to monitor Library Service events.
-	 * 
-	 * @param dispatchers
-	 *            a diagram service dispatchers
-	 */
-	public void removeDispatchers(ISaveEventDispatcher dispatcher) {
-		dispatchers.remove(dispatcher);
-	}
-	
-	public void dispatch(ISaveInfo info){
-		for (Iterator iter = dispatchers.iterator(); iter.hasNext();) {
-			ISaveEventDispatcher element = (ISaveEventDispatcher) iter.next();
-			element.updateTimeStamp(info);
-		}
-	}
-	
-	public SaveInfo getSaveInfo(Object obj, long timeStamp){
-		
-		return new SaveInfo(obj, timeStamp);
-	}
-	
-	/**
-	 * Returns a TransactionalDomain for handling things with resources.
-	 * @return
-	 */
-	public TransactionalEditingDomain createEditingDomain() {
-        String editingDomainID = EDITING_DOMIAN_ID;
-        if (editingDomainID != null) {
-            TransactionalEditingDomain editingDomain = TransactionalEditingDomain.Registry.INSTANCE
-                .getEditingDomain(editingDomainID);
-            if (editingDomain != null) {
-                return editingDomain;
-            }
-        }
-        return DiagramEditingDomainFactory.getInstance().createEditingDomain();
-    }
-	
-	/**
-	 * Returns a diagram for base activity. If diagram exists.
-	 * 
-	 * @param act
-	 * @param diagramType
-	 * @return
-	 */
-	
-	public Diagram getDiagram(Activity activity, String diagramType, boolean create, IProgressMonitor monitor){
-		Diagram diagram = null;
-		TransactionalEditingDomain domain = createEditingDomain();
-		IFile file = DiagramPersister.getFile(DiagramFileCreatorEx.default_diagram_file, activity, DiagramFileCreatorEx.getInstance());
-		
-		if(file != null){
-			if(monitor == null)monitor = new NullProgressMonitor();
-			try{
-				diagram = DiagramPersister.load(domain, file, true,  monitor, activity);
-				if(diagram != null){
-					return diagram;
-				}
-			}catch(Exception e){
-				if(debug){
-					System.out.println("Error occured while retrieving diagram for " + activity + ":" + e.getMessage());
-				}
-			}
-		}
-		if(create){
-			diagram = createDiagram(activity, diagramType, false);
-		}
-		return null;
-	}
-	
-	/**
-	 * Returns a copy of Diagram. Also copies the references and also copies the umlObject.
-	 * @param sourceDiagram
-	 * @param act
-	 * @return
-	 */
-	public Diagram copyDiagram(Diagram sourceDiagram, Activity act){
-		Diagram copy = copy(sourceDiagram);
-		EObject umlCopy = copy.getElement();
-		if(act != null){
-			BridgeHelper.addEAnnotation((NamedElement)umlCopy, act);
-		}
-		if(copy != null){
-			return copy;
-		}
-		return null;
-	}
-	
-	
-	private Diagram copy(Diagram sourceObject){
-		Copier copier = new Copier() {
-		
-			/**
-			 * 
-			 */
-			private static final long serialVersionUID = 1L;
-
-			protected void copyReference(EReference eReference, EObject eObject,
-					EObject copyEObject) {
-				if (eObject.eIsSet(eReference))
-			      {
-			        if (eReference.isMany())
-			        {
-			          InternalEList source = (InternalEList)eObject.eGet(eReference);
-			          InternalEList target = (InternalEList)copyEObject.eGet(getTarget(eReference));
-			          if (source.isEmpty())
-			          {
-			            target.clear();
-			          }
-			          else
-			          {
-			            boolean isBidirectional = eReference.getEOpposite() != null;
-			            int index = 0;
-			            for (Iterator k = resolveProxies ? source.iterator() : source.basicIterator(); k.hasNext();)
-			            {
-			              Object referencedEObject = k.next();
-			              Object copyReferencedEObject = get(referencedEObject);
-			              if (copyReferencedEObject == null)
-			              {
-			                if (!isBidirectional)
-			                {
-			                  target.addUnique(index, referencedEObject);
-			                  ++index;
-			                }
-			              }
-			              else
-			              {
-			                if (isBidirectional)
-			                {
-			                  int position = target.indexOf(copyReferencedEObject);
-			                  if (position == -1)
-			                  {
-			                    target.addUnique(index, copyReferencedEObject);
-			                  }
-			                  else if (index != position)
-			                  {
-			                    target.move(index, copyReferencedEObject);
-			                  }
-			                }
-			                else
-			                {
-			                  target.addUnique(index, copyReferencedEObject);
-			                }
-			                ++index;
-			              }
-			            }
-			          }
-			        }
-			        else
-			        {
-			          Object referencedEObject = eObject.eGet(eReference, resolveProxies);
-			          if (referencedEObject == null)
-			          {
-			            copyEObject.eSet(getTarget(eReference), null);
-			          }
-			          else
-			          {
-			            Object copyReferencedEObject = get(referencedEObject);
-			            if (copyReferencedEObject == null)
-			            {
-			              if (eReference.getEOpposite() == null)
-			              {
-			            	  // Make a copy of Activity's elements
-			            	if(referencedEObject instanceof NamedElement){
-			            		//copyReferencedEObject = copy((EObject)referencedEObject);
-			            		//copyEObject.eSet(getTarget(eReference), copyReferencedEObject);
-			            		copyEObject.eSet(getTarget(eReference), copyReferencedEObject);
-			            	}else{
-			            		copyEObject.eSet(getTarget(eReference), referencedEObject);
-			            	}
-			            	  
-			              }
-			            }
-			            else
-			            {
-			              copyEObject.eSet(getTarget(eReference), copyReferencedEObject);
-			            }
-			          }
-			        }
-			      }
-			}
-		
-		};
-		EObject umlCopy = copier.copy(sourceObject.getElement());
-		Diagram result = (Diagram)copier.copy(sourceObject);
-		result.setElement(umlCopy);
-		copier.copyReferences();
-		return result;
-	}
-	
-	
-	/**
-	 * Copies the diagram from one resources to another. This is useful in case of 
-	 * deep copy. For copy of individual diagram look at copyDiagram(Diagram sourceDiagram, Activity act)
-	 * @param sourceDiagram
-	 * @param file
-	 * @return
-	 */
-	public Diagram copyDiagramResource(Diagram sourceDiagram, IFile file) {
-		Resource sourceRes = sourceDiagram.eResource();
-		EList contents = sourceRes.getContents();
-		
-		int indexOfDiagram = contents.indexOf(sourceDiagram);
-		final Collection copiedContents = EcoreUtil.copyAll(contents);
-
-		TransactionalEditingDomain editingDomain = TransactionUtil.getEditingDomain(sourceDiagram);
-		String fileName = file.getFullPath().toString();
-		final Resource newResource = editingDomain.getResourceSet()
-            .createResource(URI.createPlatformResourceURI(fileName, true));
-         
-        Map options = new HashMap();
-        options.put(Transaction.OPTION_UNPROTECTED, Boolean.TRUE);
- 
-        AbstractEMFOperation operation = new AbstractEMFOperation(
-            editingDomain, StringStatics.BLANK,
-            options) {
-
-            protected IStatus doExecute(IProgressMonitor monitor,
-                    IAdaptable info)
-                throws ExecutionException {
-
-                newResource.getContents().addAll(copiedContents);
-
-                return Status.OK_STATUS;
-            }
-        };
-        try {
-            operation.execute(new NullProgressMonitor(), null);
-        } catch (ExecutionException e) {
-            e.printStackTrace();
-        }
- 	
-		return (Diagram)newResource.getContents().get(indexOfDiagram);
-	}
-	
-	/**
-	 * Create a diagram for given {@link Activity} and diagramKind. 
-	 * If Activity is extending/locallycontributing, gets a copy of base diagram.
-	 * else creates a new diagram for it.
-	 * @param act
-	 * @param diagramKind
-	 * @param save
-	 * @return
-	 */
-	public Diagram createDiagram(Activity act, String diagramKind, boolean save){
-		
-		if(ProcessUtil.isExtendingOrLocallyContributing(act)){
-			Diagram baseDiagram = getDiagram((Activity)act.getVariabilityBasedOnElement(),
-					diagramKind, false, new NullProgressMonitor());
-			if(baseDiagram != null){
-				Diagram copy = copyDiagram(baseDiagram, act);
-				if(copy != null){
-					return copy;
-				}
-			}
-		}
-		
-		Diagram diagram = DiagramPersister.createDiagram(createEditingDomain(),
-				diagramKind, act, false);
-		if (diagram != null) {
-			//populateDiagram(diagram, act, diagramKind);
-			return diagram;
-		}
-		return null;
-	}
-	
-	private void populateDiagram(Diagram diagram, Activity act, String diagramKind) {
-		// create GraphNode for each BreakdownElement and add it to the diagram
-		//
-		List nodes = new ArrayList();
-		if(diagram == null) return;
-		for (Iterator iter = act.getBreakdownElements().iterator(); iter
-				.hasNext();) {
-			EObject element = (EObject)iter.next();
-			nodes.add(createNode(diagram, (MethodElement)element));
-		}
-
-		// create GraphConnectors for each BreakdownElement
-		//
-		for (Iterator iter = nodes.iterator(); iter.hasNext();) {
-			Node node = (Node) iter.next();
-			createConnectors(node, diagram, diagramKind);
-		}
-	}
-	
-	private void createConnectors(Node node, Diagram diagram,
-			String diagramKind){
-		// In case of Activity diagram
-		if (diagramKind.equals(AD_kind)) {
-			MethodElement e = BridgeHelper.getMethodElement((ActivityNode)node.getElement());
-			if (e instanceof Activity) {
-				Activity act = (Activity) e;
-				for (Iterator iter = act.getLinkToPredecessor().iterator(); iter
-						.hasNext();) {
-					WorkOrder workOrder = (WorkOrder) iter.next();
-					Node srcNode = findNode(diagram, workOrder
-							.getPred());
-					if (srcNode != null) {
-						createEdge(diagram, srcNode, node);
-					}
-				}
-			}
-
-		}
-	}
-	
-	public static Node findNode(Diagram diagram, Object methodElement) {
-		for (Iterator iter = diagram.getChildren().iterator(); iter.hasNext();) {
-			View view = (View) iter.next();
-			if(view instanceof Node){
-				MethodElement e = BridgeHelper.getMethodElement((ActivityNode)view.getElement());
-				if(methodElement.equals(e)){
-					return (Node)view;
-				}
-			}
-		}
-		return null;
-	}
-	
-	public static Node findNode(Diagram diagram, NamedElement umlElement) {
-		for (Iterator iter = diagram.getChildren().iterator(); iter.hasNext();) {
-			View view = (View) iter.next();
-			if(view instanceof Node){
-				EObject e = view.getElement();
-				if(umlElement.equals(e)){
-					return (Node)view;
-				}
-			}
-		}
-		return null;
-	}
-	
-	public static Edge findEdge(Diagram diagram, Node srcNode, Node targetNode) {
-		// TODO : implement this.
-		return null;
-	}
-
-	public static Edge findEdge(Diagram diagram, MethodElement src,
-			MethodElement target) {
-
-		// TODO : implement
-		return null;
-	}
-	
-	
-	public Edge createEdge(Diagram diagram, Node srcNode,
-			Node targetNode) {
-		EObject container = diagram.getElement();
-		EReference containment = UMLPackage.eINSTANCE.getActivity_Edge();
-		EObject edge = EMFCoreUtil.create(container, containment, UMLPackage.eINSTANCE.getActivityEdge());
-		//TODO: remove Creation node. Adding Model will create View.
-		return ViewService.createEdge(srcNode, targetNode, edge, ViewType.DIAGRAM_LINK, 
-						DIAGRAM_PREFERENCES_HINT);
-	}
-	
-	public Node createNode(Diagram diagram, MethodElement e ){
-		EObject element = e;
-		EObject umlClass = getElement(element);
-		EObject umlObject = UMLFactory.eINSTANCE.create((EClass)umlClass);
-		
-		//TODO: remove Creation node. Adding Model will create View.
-		Node node = ViewService.createNode(diagram, umlObject, "", 
-				DIAGRAM_PREFERENCES_HINT);
-		BridgeHelper.addEAnnotation((EModelElement)node.getElement(),e);
-		return node;
-	}
-	
-	public int getDiagramType(Diagram diagram) {
-		String typeStr = diagram.getType();
-		for (int i = 0; i < DIAGRAM_KINDS.length; i++) {
-			if (DIAGRAM_KINDS[i].equals(typeStr))
-				return i;
-		}
-		return -1;
-	}
-	
-	public List getCommandListeners(){
-		
-		return null;
-	}
-	
-	public boolean refreshFromBase(Diagram diagram, TransactionalEditingDomain domain) {
-		
-		class RefreshFromBaseOperation extends AbstractEMFOperation{
-			
-			private Diagram diagram;
-
-			public RefreshFromBaseOperation(TransactionalEditingDomain domain, Diagram diagram) {
-				super(domain, "Refresh from base");
-				this.diagram = diagram;
-			}
-			
-			protected IStatus doExecute(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
-				EObject umlObject = diagram.getElement();
-				if(umlObject instanceof Activity){
-					Activity act =  (Activity)BridgeHelper.getMethodElementFromAnnotation((EModelElement)umlObject);
-					Activity base = (Activity)act.getVariabilityBasedOnElement();
-					if(base == null 
-							|| act.getVariabilityType() == VariabilityType.LOCAL_REPLACEMENT_LITERAL ){
-						return Status.CANCEL_STATUS;
-					}
-					
-					int type = DiagramService.eInstance().getDiagramType(diagram);
-					Diagram baseDiagram = DiagramService.eInstance().getDiagram(base, diagram.getType(), false, new NullProgressMonitor());
-					if(baseDiagram == null) return Status.CANCEL_STATUS;
-					
-					List oldNodes = new ArrayList();
-					Diagram baseCopy = copyDiagram(baseDiagram, base);
-					switch(type){
-					case ACTIVITY_DIAGRAM:{
-						
-						for (Iterator iter = baseDiagram.getChildren().iterator(); iter.hasNext();) {
-							Node baseNode = (Node) iter.next();
-							umlObject = baseNode.getElement();
-							if(umlObject instanceof StructuredActivityNode ||
-									umlObject instanceof ObjectNode){
-								MethodElement e = BridgeHelper.getMethodElementFromAnnotation((ActivityNode)umlObject);
-								Node node =  findNode(diagram, e);
-								if(node !=null){
-									oldNodes.add(node);
-								}
-							}else{
-								Node node = findNode(diagram, umlObject);
-								if(node != null){
-									oldNodes.add(node);
-								}
-							}
-						}
-						diagram.getChildren().removeAll(oldNodes);
-						
-						//TODO: check why this 
-//						 remove unused old UI nodes && nodes of contributor/replacer
-						for (Iterator iter = diagram.getChildren().iterator(); iter
-								.hasNext();) {
-							Node node = (Node) iter.next();
-							EObject bridge = node.getElement();
-							if (bridge instanceof ControlNode){
-								iter.remove();
-							} else {
-								if (bridge instanceof ActivityNode) {
-									MethodElement e = UmaUmlUtil.getUmaElement((NamedElement)bridge);
-									if (e instanceof Activity
-											&& ((Activity) e)
-													.getVariabilityBasedOnElement() != null) {
-										iter.remove();
-									}
-								}
-							}
-						}
-						
-//						 replace associated base element with contributing/replacing
-						// element
-						//
-						for (Iterator iter = act.getBreakdownElements().iterator(); iter
-								.hasNext();) {
-							Object element = iter.next();
-							if (element instanceof Activity) {
-								VariabilityElement baseElement = ((Activity) element)
-										.getVariabilityBasedOnElement();
-								Node node = findNode(baseCopy, baseElement);
-								if (node != null) {
-									EObject umlObj = node.getElement();
-									BridgeHelper.addEAnnotation((EModelElement)umlObj, (MethodElement)element);
-								}
-							}
-						}
-						// add new nodes
-						//
-						diagram.getChildren().addAll(baseCopy.getChildren());
-						break;
-					}
-					default: {
-
-						for (Iterator iter = baseDiagram.getChildren().iterator(); iter
-								.hasNext();) {
-							Node baseNode = (Node) iter.next();
-							umlObject = baseNode.getElement();
-							if (umlObject instanceof ActivityNode) {
-								// this is a element's node
-								MethodElement e = BridgeHelper.getMethodElement((ActivityNode)umlObject);
-								Node node = findNode(diagram, e);
-								if (node != null) {
-									oldNodes.add(node);
-								}
-							}
-						}
-
-						// remove old nodes
-						//
-						diagram.getChildren().removeAll(oldNodes);
-
-						// add new nodes
-						//
-						diagram.getChildren().addAll(baseCopy.getChildren());
-
-						break;
-					}
-					}
-				}
-				return Status.OK_STATUS;
-			}
-		}
-		try {
-			RefreshFromBaseOperation operation = new RefreshFromBaseOperation(domain, diagram);
-			IStatus status = operation.execute(new NullProgressMonitor(), null);
-			if(status.isOK()) return true;
-		} catch (ExecutionException e) {
-			// TODO : use Log
-			System.err.println("Error: Refresh from base" + e.getLocalizedMessage());
-		}
-		
-		return false;
-	}
-	
-	/**
-	 * 
-	 */
-	private static Map elements;
-
-	
-	/**
-	 * Returns 'type' of the ecore object associated with the hint.
-	 * 
-	 * 
-	 */
-	public static ENamedElement getElement(EObject object) {
-		EClass eClass = object.eClass();
-		if (elements == null) {
-			elements = new IdentityHashMap();
-			elements.put(UmaPackage.eINSTANCE.getActivity() , UMLPackage.eINSTANCE
-					.getStructuredActivityNode());
-			elements.put(UmaPackage.eINSTANCE.getTaskDescription(), UMLPackage.eINSTANCE
-					.getActivityParameterNode());
-		}
-		return (ENamedElement) elements.get(eClass);
-	}
-}
diff --git a/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/base/persistence/IDiagramService.java b/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/base/persistence/IDiagramService.java
deleted file mode 100644
index 5f74edc..0000000
--- a/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/base/persistence/IDiagramService.java
+++ /dev/null
@@ -1,33 +0,0 @@
-//------------------------------------------------------------------------------
-// Copyright (c) 2005, 2007 IBM Corporation 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:
-// IBM Corporation - initial implementation
-//------------------------------------------------------------------------------
-/**
- * 
- */
-package org.eclipse.epf.diagramming.base.persistence;
-
-/**
- * @author Shashidhar Kannoori
- *
- */
-public interface IDiagramService {
-	
-	public static final int ACTIVITY_DIAGRAM = 0;
-
-	public static final int WORK_PRODUCT_DEPENDENCY_DIAGRAM = 1;
-
-	public static final int ACTIVITY_DETAIL_DIAGRAM = 2;
-	
-	public void dispatch(ISaveInfo info);
-	
-	public SaveInfo getSaveInfo(Object obj, long timeStamp);
-	
-	public DiagramService eInstance = DiagramService.eInstance();
-}
diff --git a/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/base/persistence/ISaveEventDispatcher.java b/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/base/persistence/ISaveEventDispatcher.java
deleted file mode 100644
index 78d613b..0000000
--- a/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/base/persistence/ISaveEventDispatcher.java
+++ /dev/null
@@ -1,24 +0,0 @@
-//------------------------------------------------------------------------------
-// Copyright (c) 2005, 2007 IBM Corporation 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:
-// IBM Corporation - initial implementation
-//------------------------------------------------------------------------------
-/**
- * 
- */
-package org.eclipse.epf.diagramming.base.persistence;
-
-/**
- * @author Shashidhar Kannoori
- *
- */
-public interface ISaveEventDispatcher {
-
-	public void updateTimeStamp(ISaveInfo info);
-	
-}
diff --git a/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/base/persistence/ISaveInfo.java b/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/base/persistence/ISaveInfo.java
deleted file mode 100644
index f3020f2..0000000
--- a/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/base/persistence/ISaveInfo.java
+++ /dev/null
@@ -1,27 +0,0 @@
-//------------------------------------------------------------------------------
-// Copyright (c) 2005, 2007 IBM Corporation 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:
-// IBM Corporation - initial implementation
-//------------------------------------------------------------------------------
-/**
- * 
- */
-package org.eclipse.epf.diagramming.base.persistence;
-
-/**
- * @author Shashidhar Kannoori
- *
- */
-public interface ISaveInfo {
-	
-	public Object getSource();
-	
-	public long getTimeStamp();
-	
-	public void setTimeStamp(long timeStamp);
-}
diff --git a/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/base/persistence/SaveEventDispatcher.java b/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/base/persistence/SaveEventDispatcher.java
deleted file mode 100644
index 1ce6d2f..0000000
--- a/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/base/persistence/SaveEventDispatcher.java
+++ /dev/null
@@ -1,42 +0,0 @@
-//------------------------------------------------------------------------------
-// Copyright (c) 2005, 2007 IBM Corporation 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:
-// IBM Corporation - initial implementation
-//------------------------------------------------------------------------------
-/**
- * 
- */
-package org.eclipse.epf.diagramming.base.persistence;
-
-/**
- * @author Shashidhar Kannoori
- *
- */
-public class SaveEventDispatcher implements ISaveEventDispatcher {
-
-	private ISaveInfo info;
-
-	/**
-	 * 
-	 */
-	public SaveEventDispatcher() {
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.epf.diagramming.base.persistence.ISaveEventDispatcher#updateTimeStamp(java.lang.Object, long)
-	 */
-	public void updateTimeStamp(ISaveInfo info) {
-		// TODO Auto-generated method stub
-		this.info = info;
-	}
-
-	public void dispatch(){
-		DiagramService.eInstance.dispatch(info);
-	}
-	
-}
diff --git a/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/base/persistence/SaveInfo.java b/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/base/persistence/SaveInfo.java
deleted file mode 100644
index 965aaff..0000000
--- a/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/base/persistence/SaveInfo.java
+++ /dev/null
@@ -1,57 +0,0 @@
-//------------------------------------------------------------------------------
-// Copyright (c) 2005, 2007 IBM Corporation 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:
-// IBM Corporation - initial implementation
-//------------------------------------------------------------------------------
-/**
- * 
- */
-package org.eclipse.epf.diagramming.base.persistence;
-
-/**
- * @author Shashidhar Kannoori
- *
- */
-public class SaveInfo implements ISaveInfo {
-
-	
-	private Object source;
-	private long timeStamp;
-
-	/**
-	 * 
-	 */
-	public SaveInfo(Object source, long timeStamp) {
-		this.source = source;
-		this.timeStamp = timeStamp;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.epf.diagramming.base.persistence.ISaveInfo#getSource()
-	 */
-	public Object getSource() {
-		// TODO Auto-generated method stub
-		return source;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.epf.diagramming.base.persistence.ISaveInfo#getTimeStamp()
-	 */
-	public long getTimeStamp() {
-		// TODO Auto-generated method stub
-		return timeStamp;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.epf.diagramming.base.persistence.ISaveInfo#setTimeStamp()
-	 */
-	public void setTimeStamp(long timeStamp) {
-		this.timeStamp = timeStamp;
-	}
-
-}
diff --git a/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/base/policies/ActivityNodeResizableEditPolicy.java b/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/base/policies/ActivityNodeResizableEditPolicy.java
deleted file mode 100644
index 57acaae..0000000
--- a/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/base/policies/ActivityNodeResizableEditPolicy.java
+++ /dev/null
@@ -1,45 +0,0 @@
-//------------------------------------------------------------------------------
-// Copyright (c) 2005, 2007 IBM Corporation 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:
-// IBM Corporation - initial implementation
-//------------------------------------------------------------------------------
-/**
- * 
- */
-package org.eclipse.epf.diagramming.base.policies;
-
-import org.eclipse.gef.Handle;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.requests.ChangeBoundsRequest;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.ResizableShapeEditPolicy;
-
-/**
- * @author Shashidhar Kannoori
- *
- */
-public class ActivityNodeResizableEditPolicy extends ResizableShapeEditPolicy {
-
-	/**
-	 * 
-	 */
-	public ActivityNodeResizableEditPolicy() {
-		// TODO Auto-generated constructor stub
-	}
-
-
-	protected Command getMoveCommand(ChangeBoundsRequest request) {
-		// TODO Auto-generated method stub
-		return super.getMoveCommand(request);
-	}
-	
-
-	protected void replaceHandleDragEditPartsTracker(Handle handle) {
-		// TODO Auto-generated method stub
-		super.replaceHandleDragEditPartsTracker(handle);
-	}
-}
diff --git a/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/base/policies/ActivityPartitionCreationEditPolicy.java b/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/base/policies/ActivityPartitionCreationEditPolicy.java
deleted file mode 100644
index 62cbfca..0000000
--- a/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/base/policies/ActivityPartitionCreationEditPolicy.java
+++ /dev/null
@@ -1,62 +0,0 @@
-//------------------------------------------------------------------------------
-// Copyright (c) 2005, 2007 IBM Corporation 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:
-// IBM Corporation - initial implementation
-//------------------------------------------------------------------------------
-/**
- * 
- */
-package org.eclipse.epf.diagramming.base.policies;
-
-import java.util.Iterator;
-
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gmf.runtime.diagram.ui.commands.CreateCommand;
-import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.CreationEditPolicy;
-import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramUIMessages;
-import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;
-import org.eclipse.gmf.runtime.emf.commands.core.command.CompositeTransactionalCommand;
-import org.eclipse.gmf.runtime.notation.View;
-
-/**
- * CreationEditPolicy for ActivityPartition
- * @author Shashidhar Kannoori
- *
- */
-public class ActivityPartitionCreationEditPolicy extends CreationEditPolicy {
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.gmf.runtime.diagram.ui.editpolicies.CreationEditPolicy#getCreateCommand(org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest)
-	 * @modified
-	 */
-	protected Command getCreateCommand(CreateViewRequest request) {
-		TransactionalEditingDomain editingDomain = ((IGraphicalEditPart) getHost())
-				.getEditingDomain();
-		CompositeTransactionalCommand cc = new CompositeTransactionalCommand(
-				editingDomain, DiagramUIMessages.AddCommand_Label);
-
-		Iterator descriptors = request.getViewDescriptors().iterator();
-
-		while (descriptors.hasNext()) {
-			CreateViewRequest.ViewDescriptor descriptor = (CreateViewRequest.ViewDescriptor) descriptors
-					.next();
-			View containerView = (View) getHost().getModel();
-//			while(containerView.getElement() instanceof ActivityPartition){
-//				containerView = (View)containerView.eContainer();
-//			}
-			CreateCommand createCommand = new CreateCommand(editingDomain,
-					descriptor, containerView);
-
-			cc.compose(createCommand);
-		}
-	return new ICommandProxy(cc.reduce());
-	}
-}
diff --git a/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/base/policies/ActivityPartitionDelegationEditPolicy.java b/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/base/policies/ActivityPartitionDelegationEditPolicy.java
deleted file mode 100644
index 2dff033..0000000
--- a/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/base/policies/ActivityPartitionDelegationEditPolicy.java
+++ /dev/null
@@ -1,160 +0,0 @@
-//------------------------------------------------------------------------------
-// Copyright (c) 2005, 2007 IBM Corporation 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:
-// IBM Corporation - initial implementation
-//------------------------------------------------------------------------------
-package org.eclipse.epf.diagramming.base.policies;
-
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.editpolicies.AbstractEditPolicy;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
-
-/**
- * ActivityPartition delegates to its compartment edit policy
- *   
- */
-public class ActivityPartitionDelegationEditPolicy extends
-        AbstractEditPolicy {
-
-    private EditPart childEditPart;
-    private EditPolicy childEditPolicy;
-    private final String childViewID;
-    private final String editPolicyID;
-    
-    
-    public ActivityPartitionDelegationEditPolicy(String childId, String editPolicyId) {
-        childViewID = childId;
-        editPolicyID = editPolicyId;
-    }
-    
-
-   /**
-    * (non-Javadoc)
-    * @see org.eclipse.gef.editpolicies.AbstractEditPolicy#activate()
-    */
-    public void activate() {
-        childEditPart =
-            ((IGraphicalEditPart)getHost()).getChildBySemanticHint(childViewID);
-        if (childEditPart == null) {
-            return;
-        }
-        childEditPolicy = childEditPart.getEditPolicy(editPolicyID);
-        childEditPolicy.setHost(childEditPart);
-        childEditPolicy.activate();
-    }
-
-  /**
-   * (non-Javadoc)
-   * @see org.eclipse.gef.editpolicies.AbstractEditPolicy#deactivate()
-   */
-    public void deactivate() {
-        if (childEditPolicy == null) {
-            return;
-        }
-        childEditPolicy.deactivate();
-        childEditPart = null;
-        childEditPolicy = null;
-    }
-
-
-   /**
-    * 
-    */
-    public void eraseSourceFeedback(Request request) {
-        if (childEditPolicy == null) {
-            return;
-        }
-        childEditPolicy.eraseSourceFeedback(request);
-    }
-
-
-    /*
-     * (non-Javadoc)
-     * @see org.eclipse.gef.editpolicies.AbstractEditPolicy#eraseTargetFeedback(org.eclipse.gef.Request)
-     * @modified
-     */
-    public void eraseTargetFeedback(Request request) {
-        if (childEditPolicy == null) {
-            return;
-        }
-        childEditPolicy.eraseTargetFeedback(request);
-    }
-
-
-    /*
-     * (non-Javadoc)
-     * @see org.eclipse.gef.editpolicies.AbstractEditPolicy#getCommand(org.eclipse.gef.Request)
-     * @modified
-     */
-    public Command getCommand(Request request) {
-        if (childEditPolicy == null) {
-            return null;
-        }
-        return childEditPolicy.getCommand(request);
-    }
-
-
-    /*
-     * (non-Javadoc)
-     * @see org.eclipse.gef.editpolicies.AbstractEditPolicy#getTargetEditPart(org.eclipse.gef.Request)
-     * @modified
-     */
-    public EditPart getTargetEditPart(Request request) {
-        if (childEditPolicy == null) {
-            return null;
-        }
-        return childEditPolicy.getTargetEditPart(request);
-    }
-
-
-    /*
-     * (non-Javadoc)
-     * @see org.eclipse.gef.editpolicies.AbstractEditPolicy#showSourceFeedback(org.eclipse.gef.Request)
-     * @modified
-     */
-    public void showSourceFeedback(Request request) {
-        if (childEditPolicy == null) {
-            return;
-        }
-        childEditPolicy.showSourceFeedback(request);
-    }
-
-
-    /*
-     * (non-Javadoc)
-     * @see org.eclipse.gef.editpolicies.AbstractEditPolicy#showTargetFeedback(org.eclipse.gef.Request)
-     * @modified
-     */
-    public void showTargetFeedback(Request request) {
-        if (childEditPolicy == null) {
-            return;
-        }
-        childEditPolicy.showTargetFeedback(request);
-    }
-
-
-    /*
-     * (non-Javadoc)
-     * @see org.eclipse.gef.editpolicies.AbstractEditPolicy#understandsRequest(org.eclipse.gef.Request)
-     * @modified
-     */
-    public boolean understandsRequest(Request req) {
-        if (childEditPart == null) {
-            activate();
-        }
-        if (childEditPolicy == null) {
-            return false;
-        }
-        return childEditPolicy.understandsRequest(req);
-    }
-
-
-}
diff --git a/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/base/policies/ActivityPartitionLayoutEditPolicy.java b/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/base/policies/ActivityPartitionLayoutEditPolicy.java
deleted file mode 100644
index a0a7bab..0000000
--- a/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/base/policies/ActivityPartitionLayoutEditPolicy.java
+++ /dev/null
@@ -1,37 +0,0 @@
-//------------------------------------------------------------------------------
-// Copyright (c) 2005, 2007 IBM Corporation 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:
-// IBM Corporation - initial implementation
-//------------------------------------------------------------------------------
-package org.eclipse.epf.diagramming.base.policies;
-
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.ResizableShapeEditPolicy;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.XYLayoutEditPolicy;
-
-/**
- * XYLayoutPolicy for ActivityPartition to handle the move of children.
- * @author Shashidhar Kannoori
- * @written
- */
-public class ActivityPartitionLayoutEditPolicy extends XYLayoutEditPolicy {
-
-	protected EditPolicy createChildEditPolicy(EditPart child) {
-		EditPolicy result = super.createChildEditPolicy(child);
-		if (result == null) {
-			return new ResizableShapeEditPolicy();
-		}
-		return result;
-	}
-	protected Command getMoveChildrenCommand(Request request) {
-        return super.getMoveChildrenCommand(request);
-	}
-}
diff --git a/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/base/policies/ActivityXYLayoutEditPolicy.java b/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/base/policies/ActivityXYLayoutEditPolicy.java
deleted file mode 100644
index 65c3487..0000000
--- a/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/base/policies/ActivityXYLayoutEditPolicy.java
+++ /dev/null
@@ -1,109 +0,0 @@
-//------------------------------------------------------------------------------
-// Copyright (c) 2005, 2007 IBM Corporation 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:
-// IBM Corporation - initial implementation
-//------------------------------------------------------------------------------
-/**
- * 
- */
-package org.eclipse.epf.diagramming.base.policies;
-
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.draw2d.geometry.Rectangle;
-import org.eclipse.epf.diagramming.base.util.ADDiagramUtil;
-import org.eclipse.epf.diagramming.edit.parts.ActivityPartitionEditPart;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.requests.ChangeBoundsRequest;
-import org.eclipse.gmf.runtime.common.core.command.ICommand;
-import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;
-import org.eclipse.gmf.runtime.diagram.ui.commands.SetBoundsCommand;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.ShapeEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.ShapeNodeEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.XYLayoutEditPolicy;
-import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramUIMessages;
-import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;
-import org.eclipse.gmf.runtime.notation.View;
-
-/**
- * @author Shashidhar Kannoori
- * @author Shilpa Toraskar
- * 
- */
-public class ActivityXYLayoutEditPolicy extends XYLayoutEditPolicy {
-
-	/**
-	 * 
-	 */
-	public ActivityXYLayoutEditPolicy() {
-	}
-
-	protected Command createAddCommand(EditPart child, Object constraint) {
-		Object parent  = child.getParent();
-		if ((parent instanceof ActivityPartitionEditPart) &&
-			( child instanceof ShapeEditPart && constraint instanceof Rectangle)) {
-				
-			Rectangle rect = (Rectangle) constraint;
-			int x = rect.x - ((ActivityPartitionEditPart) parent).getLocation().x;
-			int y = rect.y - ((ActivityPartitionEditPart) parent).getLocation().y;
-			
-	 		ICommand boundsCommand = 
-	 			new SetBoundsCommand(((ShapeEditPart) child).getEditingDomain(),
-	 				DiagramUIMessages.SetLocationCommand_Label_Resize,
-	 				new EObjectAdapter((View) child.getModel()),
-					new Point(x, y)); 
-	 		
-			return new ICommandProxy(boundsCommand);
-		}
-		
-		return super.createAddCommand(child, constraint);
-	}
-
-	protected Command getMoveChildrenCommand(Request request) {
-		return super.getMoveChildrenCommand(request);
-	}
-
-
-	protected Command createChangeConstraintCommand(EditPart child,
-			Object constraint) {
-		return super.createChangeConstraintCommand(child, constraint);
-	}
-
-
-	protected Command createChangeConstraintCommand(
-			ChangeBoundsRequest request, EditPart child, Object constraint) {
-		Command cmd = super.createChangeConstraintCommand(request, child,
-				constraint);
-		if (child instanceof ActivityPartitionEditPart) {
-			List list = ADDiagramUtil
-					.getNodesInPartition((ActivityPartitionEditPart) child);
-			if (list != null && !list.isEmpty()) {
-				for (Iterator iter = list.iterator(); iter.hasNext();) {
-					EditPart element = (EditPart) iter.next();
-					if (element instanceof ShapeNodeEditPart) {
-						ChangeBoundsRequest req = new ChangeBoundsRequest(
-								REQ_RESIZE_CHILDREN);
-						req.setEditParts(element);
-						req.setMoveDelta(request.getMoveDelta());
-						req.setSizeDelta(request.getSizeDelta());
-						req.setLocation(request.getLocation());
-						req.setExtendedData(request.getExtendedData());
-						req.setResizeDirection(request.getResizeDirection());
-						cmd = cmd.chain(element.getParent().getCommand(req));
-					}
-				}
-			}
-		}
-		return cmd;
-	}
-
-}
diff --git a/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/base/policies/OpenADDEditPolicy.java b/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/base/policies/OpenADDEditPolicy.java
deleted file mode 100644
index 7801daa..0000000
--- a/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/base/policies/OpenADDEditPolicy.java
+++ /dev/null
@@ -1,84 +0,0 @@
-/**
- * 
- */
-package org.eclipse.epf.diagramming.base.policies;
-
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.epf.diagram.core.bridge.BridgeHelper;
-import org.eclipse.epf.diagram.core.bridge.DiagramAdapter;
-import org.eclipse.epf.diagram.core.bridge.NodeAdapter;
-import org.eclipse.epf.diagram.core.part.DiagramEditorInput;
-import org.eclipse.epf.diagram.core.part.util.DiagramEditorUtil;
-import org.eclipse.epf.diagramming.part.EPFDiagramEditorPlugin;
-import org.eclipse.epf.library.edit.util.IDiagramManager;
-import org.eclipse.epf.uma.Activity;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.GraphicalViewer;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.DiagramEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.OpenEditPolicy;
-import org.eclipse.gmf.runtime.diagram.ui.parts.DiagramEditDomain;
-import org.eclipse.gmf.runtime.notation.Diagram;
-import org.eclipse.gmf.runtime.notation.Node;
-import org.eclipse.ui.IWorkbenchPart;
-
-/**
- * Mouse double click on StructuredActivityEditPart should open diagram. 
- * @author Shashidhar Kannoori
- *
- */
-public class OpenADDEditPolicy extends OpenEditPolicy {
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.gmf.runtime.diagram.ui.editpolicies.OpenEditPolicy#getOpenCommand(org.eclipse.gef.Request)
-	 */
-	@Override
-	protected Command getOpenCommand(Request request) {
-		EditPart targetEditPart = getTargetEditPart(request);
-		if (targetEditPart instanceof IGraphicalEditPart) {
-			Node view = (Node) targetEditPart.getModel();
-
-			DiagramEditPart diagramEditPart = (DiagramEditPart) targetEditPart
-					.getParent();
-			Diagram diagram = (Diagram) diagramEditPart.getModel();
-			DiagramAdapter diagramAdapter = BridgeHelper
-					.getDiagramAdapter(diagram.getElement());
-
-			NodeAdapter adapter = BridgeHelper
-					.getNodeAdapter(view.getElement());
-			if (adapter != null && adapter.getElement() instanceof Activity) {
-				Object selectedObject = adapter.getWrapper();
-				if (selectedObject == null) {
-					selectedObject = adapter.getElement();
-				}
-				GraphicalViewer viewer = (GraphicalViewer) diagramEditPart
-						.getViewer();
-				if (viewer != null) {
-					DiagramEditDomain domain = (DiagramEditDomain) viewer
-							.getEditDomain();
-					IWorkbenchPart part = domain.getDiagramEditorPart();
-					if (part != null) {
-						DiagramEditorInput input = new org.eclipse.epf.diagram.core.part.DiagramEditorInput(
-								selectedObject,
-								diagramAdapter.getSuppression(),
-								IDiagramManager.ACTIVITY_DIAGRAM);
-						try{
-						DiagramEditorUtil
-								.openDiagramEditor(
-										part.getSite().getPage(),
-										input,
-										EPFDiagramEditorPlugin.DIAGRAM_PREFERENCES_HINT,
-										new NullProgressMonitor());
-						}catch(Exception e){
-							
-						}
-					}
-				}
-			}
-		}
-		return null;
-	}
-
-}
diff --git a/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/base/providers/DiagramEditorDocumentProvider.java b/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/base/providers/DiagramEditorDocumentProvider.java
deleted file mode 100644
index 209c5c0..0000000
--- a/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/base/providers/DiagramEditorDocumentProvider.java
+++ /dev/null
@@ -1,565 +0,0 @@
-//------------------------------------------------------------------------------
-// Copyright (c) 2005, 2007 IBM Corporation 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:
-// IBM Corporation - initial implementation
-//------------------------------------------------------------------------------
-/**
- * 
- */
-package org.eclipse.epf.diagramming.base.providers;
-
-import java.io.ByteArrayInputStream;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.filebuffers.manipulation.ContainerCreator;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IResourceDelta;
-import org.eclipse.core.resources.IStorage;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.core.runtime.SubProgressMonitor;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.emf.workspace.AbstractEMFOperation;
-import org.eclipse.emf.workspace.util.WorkspaceSynchronizer;
-import org.eclipse.epf.diagram.core.part.DiagramFileEditorInputProxy;
-import org.eclipse.epf.diagram.core.part.IDiagramFileEditorInputProxy;
-import org.eclipse.epf.diagramming.base.DiagrammingResources;
-import org.eclipse.epf.diagramming.base.persistence.DiagramPersister;
-import org.eclipse.epf.diagramming.base.persistence.DiagramService;
-import org.eclipse.epf.diagramming.base.persistence.ISaveEventDispatcher;
-import org.eclipse.epf.diagramming.base.persistence.ISaveInfo;
-import org.eclipse.epf.diagramming.base.persistence.SaveEventDispatcher;
-import org.eclipse.epf.diagramming.base.persistence.SaveInfo;
-import org.eclipse.epf.diagramming.base.util.UmaUmlUtil;
-import org.eclipse.epf.diagramming.part.EPFDiagramEditorPlugin;
-import org.eclipse.gmf.runtime.diagram.ui.resources.editor.document.DiagramModificationListener;
-import org.eclipse.gmf.runtime.diagram.ui.resources.editor.document.IDiagramDocument;
-import org.eclipse.gmf.runtime.diagram.ui.resources.editor.document.IDocument;
-import org.eclipse.gmf.runtime.diagram.ui.resources.editor.ide.document.FileDiagramDocumentProvider;
-import org.eclipse.gmf.runtime.emf.core.resources.GMFResource;
-import org.eclipse.gmf.runtime.notation.Diagram;
-import org.eclipse.ui.IEditorInput;
-import org.eclipse.ui.IFileEditorInput;
-import org.eclipse.ui.IStorageEditorInput;
-import org.eclipse.uml2.uml.Activity;
-import org.eclipse.uml2.uml.NamedElement;
-
-/**
- * Specialized document provider for handle changes and manipulate document associated 
- * and synchronize the other opened editor's document and do merge any conflict synchronize.
- * Also handles the timestamp synchronization if the multiple editors are sharing same resource.
- * @author Shashidhar Kannoori
- */
-public class DiagramEditorDocumentProvider extends FileDiagramDocumentProvider {
-
-	/**
-	 * 
-	 */
-	public DiagramEditorDocumentProvider() {
-		// TODO Auto-generated constructor stub
-	}
-
-	/**
-	 * (non-Javadoc)
-	 * @see org.eclipse.gmf.runtime.diagram.ui.resources.editor.ide.document.FileDiagramDocumentProvider#setDocumentContent(org.eclipse.gmf.runtime.diagram.ui.resources.editor.document.IDocument, org.eclipse.ui.IEditorInput)
-	 * 
-	 * @modified
-	 */
-	protected boolean setDocumentContent(IDocument document,
-			IEditorInput editorInput) throws CoreException {
-		if (editorInput instanceof DiagramFileEditorInputProxy) {
-			DiagramFileEditorInputProxy diagramElement = (DiagramFileEditorInputProxy) editorInput;
-
-			((IDiagramDocument) document).setEditingDomain(diagramElement
-					.getEditingDomain());
-			if (editorInput instanceof IStorageEditorInput) {
-				IStorage storage = ((IStorageEditorInput) editorInput)
-						.getStorage();
-				setDocumentContentFromStorage(document, storage, editorInput);
-				return true;
-			}
-		}
-		return false;
-	}
-
-	protected void setupDocument(Object element, IDocument document) {
-		super.setupDocument(element, document);
-	}
-
-	/**
-	 * (non-Javadoc)
-	 * @custom
-	 */
-	protected void setDocumentContentFromStorage(IDocument document,
-			IStorage storage, IEditorInput editorInput) throws CoreException {
-		Diagram diagram = (Diagram) document.getContent();
-		if (diagram != null) {
-			Resource resource = diagram.eResource();
-			IFile resourceFile = WorkspaceSynchronizer.getFile(resource);
-			// unload if the resourceFile and storage is same.
-			// if not same throw exception.
-			if (resourceFile != null) {
-				if (resourceFile.equals(storage)) {
-					document.setContent(null);
-				} else {
-					throw new CoreException(
-							new Status(
-									IStatus.ERROR,
-									"1",
-									1,
-									DiagrammingResources.FileDocumentProvider_handleElementContentChanged,
-									null));
-				}
-			}
-		}
-		IDiagramDocument diagramDocument = (IDiagramDocument) document;
-		TransactionalEditingDomain domain = diagramDocument.getEditingDomain();
-
-		diagram = DiagramPersister.load(domain, storage, true,
-				getProgressMonitor(), editorInput);
-		document.setContent(diagram);
-		//super.setDocumentContentFromStorage(document, storage);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.gmf.runtime.diagram.ui.resources.editor.ide.document.FileDiagramDocumentProvider#handleElementContentChanged(org.eclipse.ui.IFileEditorInput)
-	 * @custom
-	 */
-	protected void handleElementContentChanged(IFileEditorInput fileEditorInput) {
-
-		FileInfo info= (FileInfo) getElementInfo(fileEditorInput);
-		if (info == null)
-			return;
-
-		IDocument document= createEmptyDocument();
-		IStatus status= null;
-
-		try {
-
-			try {
-				refreshFile(fileEditorInput.getFile());
-			} catch (CoreException x) {
-				handleCoreException(x, "File Changed outside");
-			}
-
-			setDocumentContent(document, fileEditorInput);
-
-		} catch (CoreException x) {
-			status= x.getStatus();
-		}
-
-		Object newContent= document.getContent();
-
-		if ( !newContent.equals(info.fDocument.getContent())) {
-
-			// set the new content and fire content related events
-			fireElementContentAboutToBeReplaced(fileEditorInput);
-
-			removeUnchangedElementListeners(fileEditorInput, info);
-
-			info.fDocument.removeDocumentListener(info);
-			info.fDocument.setContent(newContent);
-			info.fCanBeSaved= false;
-			info.fModificationStamp= computeModificationStamp(fileEditorInput.getFile());
-			info.fStatus= status;
-
-			addUnchangedElementListeners(fileEditorInput, info);
-
-			fireElementContentReplaced(fileEditorInput);
-
-		} 
-	}
-	protected void handleElementMoved(IFileEditorInput fileEditorInput, IPath path) {
-		super.handleElementMoved(fileEditorInput, path);
-	}
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.gmf.runtime.diagram.ui.resources.editor.ide.document.FileDiagramDocumentProvider#createInputWithEditingDomain(org.eclipse.ui.IEditorInput, org.eclipse.emf.transaction.TransactionalEditingDomain)
-	 * @custom
-	 */
-	public IEditorInput createInputWithEditingDomain(IEditorInput editorInput, TransactionalEditingDomain domain) {
-		if(editorInput instanceof IDiagramFileEditorInputProxy){
-			((IDiagramFileEditorInputProxy)editorInput).setTransactionalEditingDomain(domain);
-			return editorInput;
-		}else{
-			return super.createInputWithEditingDomain(editorInput, domain);
-		}
-	}
-	/**
-	 * @author Shashidhar Kannoori
-	 * @custom
-	 */
-	public class DiagramFileInfoSync extends DiagramFileInfo{
-
-		ISaveEventDispatcher dispatcher;
-		IFileEditorInput input;
-		public boolean refreshedByShared = false;
-		public DiagramFileInfoSync(IDocument document, FileSynchronizer fileSynchronizer, DiagramModificationListener listener,
-				IFileEditorInput input) {
-			super(document, fileSynchronizer, listener);
-			final IDocument inUseDocument = document;
-			final DiagramFileEditorInputProxy inputProxy =(DiagramFileEditorInputProxy)input;
-			if(dispatcher == null){
-				dispatcher = new SaveEventDispatcher(){
-					public void updateTimeStamp(ISaveInfo info) {
-						fModificationStamp = info.getTimeStamp();
-//						Object object = info.getSource();
-//						
-//						if(object instanceof ElementInfo){
-//							
-//							if(inUseDocument.equals(((ElementInfo)object).fDocument)){
-//								return;
-//							}
-//						}
-//						MergeOperation operation = new MergeOperation(inputProxy.getEditingDomain(),
-//								"Document Merge Operation", (ElementInfo)object, inUseDocument);
-//						try{
-//							operation.execute(new NullProgressMonitor(), null );
-//						}catch(ExecutionException exception){
-//							exception.printStackTrace();
-//						}
-					}
-				};
-				if(dispatcher != null){
-					DiagramService.eInstance().addDispatchers(dispatcher);
-				}
-			}
-			this.input = input;
-			
-		}
-		public void updateTimeStamp(){
-			long timestamp = getModificationStamp(input);
-			SaveInfo info = DiagramService.eInstance().getSaveInfo(this, timestamp);
-			refreshedByShared = true;
-			DiagramService.eInstance().dispatch(info);
-			refreshedByShared = false;
-		}
-		public void updateTimeStamp(IFile file){
-			long timestamp = computeModificationStamp(file);
-			SaveInfo info = DiagramService.eInstance().getSaveInfo(this, timestamp);
-			DiagramService.eInstance().dispatch(info);
-		}
-
-		
-		public void disposeDispatcher(){
-			if(dispatcher !=null)
-				DiagramService.eInstance().removeDispatchers(dispatcher);
-		}
-	}
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.gmf.runtime.diagram.ui.resources.editor.ide.document.FileDiagramDocumentProvider#doSaveDocument(org.eclipse.core.runtime.IProgressMonitor, java.lang.Object, org.eclipse.gmf.runtime.diagram.ui.resources.editor.document.IDocument, boolean)
-	 * @custom
-	 */
-	protected void doSaveDocument(IProgressMonitor monitor, Object element, IDocument document, boolean overwrite) throws CoreException {
-		if (element instanceof IFileEditorInput) {
-
-			IFileEditorInput input= (IFileEditorInput) element;
-			FileInfo info= (FileInfo) getElementInfo(element);
-			IFile file= input.getFile();
-
-			if (file.exists()) {
-
-				if (info != null && !overwrite)
-					checkSynchronizationState(info.fModificationStamp, file);
-
-				// inform about the upcoming content change
-				fireElementStateChanging(element);
-				try {
-					System.out.println("Time timestamp before saving: " + computeModificationStamp(file));
-					saveDocumentToFile(document, file, overwrite, monitor);
-					// Dispatch the save event.
-					if(info instanceof DiagramFileInfoSync){
-						((DiagramFileInfoSync)info).updateTimeStamp();
-					}
-					System.out.println("Time timestamp after saving: " + computeModificationStamp(file));
-					
-				} catch (CoreException x) {
-					// inform about failure
-					fireElementStateChangeFailed(element);
-					throw x;
-				} catch (RuntimeException x) {
-					// inform about failure
-					fireElementStateChangeFailed(element);
-					throw x;
-				}
-
-				// If here, the editor state will be flipped to "not dirty".
-				// Thus, the state changing flag will be reset.
-
-				if (info != null) {
-					info.fModificationStamp= computeModificationStamp(file);
-				}
-
-			} else {
-				try {
-					monitor.beginTask(DiagrammingResources.FileDocumentProvider_task_saving, 3000);
-					ContainerCreator creator = new ContainerCreator(file.getWorkspace(), file.getParent().getFullPath());
-					creator.createContainer(new SubProgressMonitor(monitor, 1000));
-					file.create(new ByteArrayInputStream("".getBytes()), false, new SubProgressMonitor(monitor, 1000)); //$NON-NLS-1$
-					saveDocumentToFile(document, file, overwrite, new SubProgressMonitor(monitor, 1000));
-				}
-				finally {
-					monitor.done();
-				}
-			}
-		} else {
-			super.doSaveDocument(monitor, element, document, overwrite);
-		}
-	}
-	
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.gmf.runtime.diagram.ui.resources.editor.ide.document.FileDiagramDocumentProvider#disposeElementInfo(java.lang.Object, org.eclipse.gmf.runtime.diagram.ui.resources.editor.document.AbstractDocumentProvider.ElementInfo)
-	 * @custom
-	 */
-	protected void disposeElementInfo(Object element, ElementInfo info) {
-		if(info instanceof DiagramFileInfoSync){
-			((DiagramFileInfoSync)info).disposeDispatcher();
-		}
-		super.disposeElementInfo(element, info);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.gmf.runtime.diagram.ui.editor.AbstractDocumentProvider#createElementInfo(java.lang.Object)
-	 */
-	protected ElementInfo createElementInfo(Object element) throws CoreException {
-		if (element instanceof IFileEditorInput) {
-
-			IFileEditorInput input= (IFileEditorInput) element;
-
-			try {
-				refreshFile(input.getFile());
-			} catch (CoreException x) {
-				handleCoreException(x, DiagrammingResources.FileDocumentProvider_createElementInfo);
-			}
-
-			IDocument d= null;
-			IStatus s= null;
-
-			try {
-				d= createDocument(element);
-			} catch (CoreException x) {
-				handleCoreException(x, DiagrammingResources.FileDocumentProvider_createElementInfo);
-				s= x.getStatus();
-				d= createEmptyDocument();
-			}
-			
-			DiagramFileSynchronizer f= new DiagramFileSynchronizer(input);
-			f.install();
-
-			FileInfo info= createFileInfo(d, f, input);
-			info.fModificationStamp= computeModificationStamp(input.getFile());
-			info.fStatus= s;
-
-			return info;
-		}
-
-		return super.createElementInfo(element);
-	}
-	
-	/**
-	 * Does merge operation of the resource if resource contents are saved by shared
-	 * IDocument. 
-	 * @author Shashidhar Kannoori
-	 */
-	public class MergeOperation extends AbstractEMFOperation{
-
-		private ElementInfo elementInfo;
-		private IDocument toMergeDocument;
-
-		public MergeOperation(TransactionalEditingDomain domain, String label,
-				ElementInfo elementInfo, IDocument toMergeDocument) {
-			super(domain, label);
-			this.elementInfo = elementInfo;
-			this.toMergeDocument = toMergeDocument;
-		}
-
-		protected IStatus doExecute(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
-			try{
-			if(elementInfo instanceof ElementInfo){
-				IDocument savedDocument = ((ElementInfo)elementInfo).fDocument;
-				Diagram saveddiagram  = (Diagram)savedDocument.getContent();
-				if(saveddiagram != null){
-					Diagram inUseDiagram = (Diagram)toMergeDocument.getContent();
-					GMFResource gmfResource = (GMFResource)inUseDiagram.eResource();
-					EList list = gmfResource.getContents();
-
-					String guid = UmaUmlUtil.getUmaGuidFromUmlElement((NamedElement)saveddiagram.getElement());
-					Diagram replacingDiagram = null;
-					List newList = new ArrayList();
-					for (Iterator iter = list.iterator(); iter.hasNext();) {
-						EObject element = (EObject) iter.next();
-						if(element instanceof Activity){
-							String currentguid = UmaUmlUtil.getUmaGuidFromUmlElement((NamedElement)element);
-							if(currentguid.equals(guid)){
-								newList.add(saveddiagram.getElement());
-							}else{
-								newList.add(element);
-							}
-						}
-						if(element instanceof Diagram){
-							Diagram diagram = (Diagram)element;
-							EObject object = ((Diagram)element).getElement();
-							String rGuid = UmaUmlUtil.getUmaGuidFromUmlElement((NamedElement)object);
-							if(guid.equals(rGuid)){
-								replacingDiagram = diagram;
-								newList.add(saveddiagram);
-							}else{
-								newList.add(element);
-							}
-						}
-					}
-					
-					if(replacingDiagram == null){
-						newList.add(saveddiagram.getElement());
-						newList.add(saveddiagram);
-					}
-					//Transaction tx = create 
-					// TODO handle better way to merge the elements.
-					if(!newList.isEmpty()){
-						boolean notification = gmfResource.eDeliver();
-						gmfResource.eSetDeliver(false);
-						gmfResource.getContents().clear();
-						gmfResource.getContents().addAll(newList);
-						gmfResource.eSetDeliver(notification);
-						//list.addAll(newList);
-					}
-				}
-			}
-			}catch(Exception e){
-				System.out.println("Warning: Document merge failed due to "+ e.getMessage());
-				return Status.CANCEL_STATUS;
-			}
-			return Status.OK_STATUS;
-		}
-	}
-	
-	   
-    /**
-     * Handles the saving of the diagram to a file
-     * 
-     * @param domain
-     *            the TransactionalEditingDomain we are saving in
-     * @param file
-     *            the IFile to save to
-     * @param diagram
-     *            Diagram that will be saved
-     * @param options
-     *            save options or null
-     * @param monitor
-     *            IProgressMonitor
-     * @throws CoreException
-     */
-    protected void doSave(TransactionalEditingDomain domain, IFile file,
-            Diagram diagram, Map options, IProgressMonitor monitor)
-        throws CoreException {
-        if (options == null) {
-            DiagramPersister.save(domain, file, diagram, DiagramPersister
-                .hasUnrecognizedData(diagram.eResource()), monitor);
-        } else {
-        	DiagramPersister.save(domain, file, diagram, monitor, options);
-        }
-    }
-    
-    /**
-	 * Synchronizes the document with external resource changes.
-	 */
-	protected class DiagramFileSynchronizer extends FileSynchronizer {
-
-		/**
-		 * Creates a new file synchronizer. Is not yet installed on a resource.
-		 *
-		 * @param fileEditorInput the editor input to be synchronized
-		 */
-		public DiagramFileSynchronizer(IFileEditorInput fileEditorInput) {
-			super(fileEditorInput);
-		}
-		/*
-		 * @see IResourceDeltaVisitor#visit(org.eclipse.core.resources.IResourceDelta)
-		 */
-		public boolean visit(IResourceDelta delta) throws CoreException {
-			if (delta == null)
-				return false;
-
-			delta= delta.findMember(getFile().getFullPath());
-
-			if (delta == null)
-				return false;
-
-			Runnable runnable= null;
-
-			switch (delta.getKind()) {
-				case IResourceDelta.CHANGED:
-					DiagramFileInfoSync info= (DiagramFileInfoSync) getElementInfo(fFileEditorInput);
-					if (info == null || info.fCanBeSaved)
-						break;
-
-					boolean isSynchronized= computeModificationStamp(getFile()) == info.fModificationStamp;
-					if (((IResourceDelta.ENCODING & delta.getFlags()) != 0 && isSynchronized) || ((IResourceDelta.CONTENT & delta.getFlags()) != 0 && !isSynchronized)
-							|| info.refreshedByShared) {
-						runnable = new SafeChange(fFileEditorInput) {
-							protected void execute(IFileEditorInput input) throws Exception {
-								//handleElementContentChanged(input);
-							}
-						};
-					}
-					break;
-
-				case IResourceDelta.REMOVED:
-					if ((IResourceDelta.MOVED_TO & delta.getFlags()) != 0) {
-						final IPath path= delta.getMovedToPath();
-						runnable= new SafeChange(fFileEditorInput) {
-							protected void execute(IFileEditorInput input) throws Exception {
-								handleElementMoved(input, path);
-							}
-						};
-					} else {
-						info= (DiagramFileInfoSync) getElementInfo(fFileEditorInput);
-						if (info != null && !info.fCanBeSaved) {
-							runnable= new SafeChange(fFileEditorInput) {
-								protected void execute(IFileEditorInput input) throws Exception {
-									handleElementDeleted(input);
-								}
-							};
-						}
-					}
-					break;
-			}
-
-			if (runnable != null)
-				update(runnable);
-
-			return false;
-		}
-	}	
-	
-	public void unsetCanSaveDocument(Object element) {
-		if (element != null) {
-			ElementInfo info = (ElementInfo) getElementInfo(element);
-			if (info != null) {
-				removeUnchangedElementListeners(element, info);
-				info.fCanBeSaved = false;
-				addUnchangedElementListeners(element, info);
-				fireElementDirtyStateChanged(element, info.fCanBeSaved);
-			}
-		}
-	}
-}
diff --git a/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/base/util/ADDiagramUtil.java b/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/base/util/ADDiagramUtil.java
deleted file mode 100644
index 2a611c9..0000000
--- a/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/base/util/ADDiagramUtil.java
+++ /dev/null
@@ -1,130 +0,0 @@
-//------------------------------------------------------------------------------
-// Copyright (c) 2005, 2007 IBM Corporation 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:
-// IBM Corporation - initial implementation
-//------------------------------------------------------------------------------
-/**
- * 
- */
-package org.eclipse.epf.diagramming.base.util;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.PositionConstants;
-import org.eclipse.draw2d.geometry.Rectangle;
-import org.eclipse.epf.diagramming.edit.parts.ActivityEditPart;
-import org.eclipse.epf.diagramming.edit.parts.ActivityPartitionEditPart;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.GraphicalEditPart;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gmf.runtime.common.core.command.ICommand;
-import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.DiagramEditPart;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.WrapLabel;
-import org.eclipse.gmf.runtime.notation.Node;
-import org.eclipse.uml2.uml.ActivityNode;
-import org.eclipse.uml2.uml.ActivityPartition;
-
-/**
- * @author skannoor
- *
- */
-public final class ADDiagramUtil {
-	
-	public static List getNodesInPartition(ActivityPartitionEditPart child) {
-		List nodes = new ArrayList();
-		ActivityPartition partition = (ActivityPartition)((Node)child.getModel()).getElement();
-		List list = partition.getNodes();
-		for (Iterator iter = list.iterator(); iter.hasNext();) {
-			Object element = (Object) iter.next();
-			nodes.add(findEditPartyByElement(child.getParent(), element));
-		}
-		return nodes;
-	}
-	public static EditPart findEditPartyByElement(EditPart parent,
-			Object element) {
-		List list = parent.getChildren();
-		for (Iterator iter = list.iterator(); iter.hasNext();) {
-			EditPart editPart = (EditPart) iter.next();
-			if (((Node) editPart.getModel()).getElement() == element) {
-				return editPart;
-			}
-		}
-		return null;
-	}
-	public static EditPart getPartitionWhereChildIn(EditPart child, Object constraint) {
-		DiagramEditPart parent = (DiagramEditPart) child.getParent();
-		if (!(child instanceof ActivityPartitionEditPart)
-				&& parent instanceof ActivityEditPart) {
-			Object element = ((Node) child.getModel()).getElement();
-			if (element instanceof ActivityNode) {
-				List list = ((ActivityNode) element).getInPartitions();
-				for (Iterator iter = list.iterator(); iter.hasNext();) {
-//					ActivityPartition partition = (ActivityPartition) iter
-//							.next();
-					EditPart part = findEditPartyByElement(parent, element);
-					if (part != null) {
-						// Node node = (Node)part.getModel();
-						// Object x = ViewUtil.getStructuralFeatureValue(node,
-						// NotationPackage.eINSTANCE.getLocation_X());
-						// Object y = ViewUtil.getStructuralFeatureValue(node,
-						// NotationPackage.eINSTANCE.getLocation_Y());
-						// Object width =
-						// ViewUtil.getStructuralFeatureValue(node,
-						// NotationPackage.eINSTANCE.getSize_Width());
-						// Object height =
-						// ViewUtil.getStructuralFeatureValue(node,
-						// NotationPackage.eINSTANCE.getSize_Height());
-						// Rectangle rect = new Rectangle(x,y,width, height);
-						Rectangle bounds = ((GraphicalEditPart) part)
-								.getFigure().getBounds();
-						if (bounds.contains((Rectangle) constraint)) {
-							return part;
-						}
-					}
-				}
-			}
-		}
-		return null;
-	}
-	
-	public static void nouse(){
-//		if (child instanceof ActivityPartitionEditPart) {
-//			List childs = getNodesInPartition((ActivityPartitionEditPart)child);	
-//			for (Iterator iter = childs.iterator(); iter.hasNext();) {
-//				EditPart element = (EditPart) iter.next();
-//				//cmd.chain(super.createChangeConstraintCommand(element, constraint));
-//			}
-//			
-//		} else {
-//
-//			EditPart part = childInAnyPartitionArea(child, constraint);
-//			if (part instanceof ActivityPartitionEditPart) {
-//				// Rectangle bounds =
-//				// ((GraphicalEditPart)part).getFigure().getBounds();
-//				// Rectangle constaintr = (Rectangle)constraint;
-//				// bounds = bounds.expand(constaintr.width, constaintr.height);
-//				// ((GraphicalEditPart)part).getFigure().setBounds(bounds);
-////				Command cmdx = super.createChangeConstraintCommand(part,
-////						constraint);
-////				cmd.chain(cmdx);
-//
-//			}
-//		}
-	}
-	
-	/**
-	 * @generated
-	 */
-	public static Command getCommandWrapper(ICommand cmd) {
-		return new ICommandProxy(cmd);
-	}
-}
diff --git a/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/base/util/AnchorUtil.java b/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/base/util/AnchorUtil.java
deleted file mode 100644
index bc78f91..0000000
--- a/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/base/util/AnchorUtil.java
+++ /dev/null
@@ -1,77 +0,0 @@
-//------------------------------------------------------------------------------
-// Copyright (c) 2005, 2007 IBM Corporation 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:
-// IBM Corporation - initial implementation
-//------------------------------------------------------------------------------
-//------------------------------------------------------------------------------
-// Copyright (c) 2005, 2006 IBM Corporation 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:
-// IBM Corporation - initial implementation
-//------------------------------------------------------------------------------
-package org.eclipse.epf.diagramming.base.util;
-
-import org.eclipse.draw2d.geometry.Point;
-
-/**
- * Utility class for anchors.
- * 
- * @author Phong Nguyen Le
- * @since 1.0
- */
-public final class AnchorUtil {
-
-	public static Point getClosestPoint(Point[] points, Point point) {
-		int size = points.length;
-		double[] distances = new double[size];
-		for (int i = 0; i < size; i++) {
-			distances[i] = points[i].getDistance(point);
-		}
-		return points[min(distances)];
-	}
-
-	public static int min(double[] numbers) {
-		if (numbers.length == 0)
-			return -1;
-		double min = numbers[0];
-		int id = 0;
-		for (int i = 1; i < numbers.length; i++) {
-			double n = numbers[i];
-			if (n < min) {
-				min = n;
-				id = i;
-			}
-		}
-		return id;
-	}
-
-	/**
-	 * @param numbers
-	 * @return
-	 * 		index of the smallest number in the given array
-	 */
-	public static int min(int[] numbers) {
-		if (numbers.length == 0)
-			return -1;
-		int min = numbers[0];
-		int id = 0;
-		for (int i = 1; i < numbers.length; i++) {
-			int n = numbers[i];
-			if (n < min) {
-				min = n;
-				id = i;
-			}
-		}
-		return id;
-	}
-
-}
diff --git a/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/base/util/DiagramChangeListener.java b/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/base/util/DiagramChangeListener.java
deleted file mode 100644
index c37c8fb..0000000
--- a/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/base/util/DiagramChangeListener.java
+++ /dev/null
@@ -1,96 +0,0 @@
-//------------------------------------------------------------------------------
-// Copyright (c) 2005, 2007 IBM Corporation 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:
-// IBM Corporation - initial implementation
-//------------------------------------------------------------------------------
-/**
- * 
- */
-package org.eclipse.epf.diagramming.base.util;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.Notifier;
-import org.eclipse.emf.common.notify.impl.AdapterImpl;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.epf.uma.Activity;
-import org.eclipse.epf.uma.MethodElement;
-import org.eclipse.gmf.runtime.notation.Diagram;
-
-/**
- * DiagramChangeListener listens to the Notification of Notifier (mainly {@link Activity}
- * Similar to the GEF based ActivityDiagram {@link org.eclipse.epf.diagram.model.util.IDiagramChangeListener}
- * @author Shashidhar Kannoori
- */
-public class DiagramChangeListener extends AdapterImpl implements IDiagramChangeListener {
-
-	private MethodElement object;
-	private Diagram diagram;
-	
-	public DiagramChangeListener(TransactionalEditingDomain domain,
-			MethodElement object, Diagram diagram) {
-		this.object = object;
-		this.diagram = diagram;
-	}
-
-	public DiagramChangeListener(MethodElement object, Diagram diagram) {
-		this.object = object;
-		this.diagram = diagram;
-	}
-	public Diagram getDiagram() {
-		return diagram;
-	}
-
-	public Notifier getTarget() {
-		return object;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.emf.common.notify.Adapter#isAdapterForType(java.lang.Object)
-	 */
-	public boolean isAdapterForType(Object type) {
-		// TODO Auto-generated method stub
-		return false;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.emf.common.notify.Adapter#notifyChanged(org.eclipse.emf.common.notify.Notification)
-	 */
-	public void notifyChanged(Notification msg) {
-//		if (!notificationEnabled )
-//			return;
-//		notificationEnabled = false;
-//		try {
-//			//Object obj;
-//			switch (msg.getFeatureID(Activity.class)) {
-//			case UmaPackage.ACTIVITY__BREAKDOWN_ELEMENTS:
-//				switch (msg.getEventType()) {
-//				case Notification.ADD:
-//					System.out.println("Notification Add");
-//					break;
-//				case Notification.REMOVE:
-//					System.out.println("Notification Add");
-//					break;
-//				case Notification.ADD_MANY:
-//					System.out.println("Notification Add");
-//					break;
-//				case Notification.REMOVE_MANY:
-//					System.out.println("Notification Add");
-//					break;
-//				case Notification.MOVE:
-//					System.out.println("Notification Add");
-//					break;
-//				}
-//				break;
-//			}
-//		}
-//		finally {
-//			notificationEnabled = true;
-//		}
-		super.notifyChanged(msg);
-	}
-}
diff --git a/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/base/util/DiagramEditorUtil.java b/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/base/util/DiagramEditorUtil.java
deleted file mode 100644
index 41997bc..0000000
--- a/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/base/util/DiagramEditorUtil.java
+++ /dev/null
@@ -1,621 +0,0 @@
-//------------------------------------------------------------------------------
-// Copyright (c) 2005, 2007 IBM Corporation 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:
-// IBM Corporation - initial implementation
-//------------------------------------------------------------------------------
-package org.eclipse.epf.diagramming.base.util;
-
-import java.io.File;
-import java.io.InputStream;
-import java.lang.reflect.InvocationTargetException;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Set;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.commands.operations.OperationHistoryFactory;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IWorkspaceRoot;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.SubProgressMonitor;
-import org.eclipse.emf.common.command.CompoundCommand;
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.ecore.resource.ResourceSet;
-import org.eclipse.emf.edit.command.CopyCommand.Helper;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.emf.transaction.impl.InternalTransactionalEditingDomain;
-import org.eclipse.epf.common.CommonPlugin;
-import org.eclipse.epf.diagram.core.bridge.ActivityDiagramAdapter;
-import org.eclipse.epf.diagram.core.part.DiagramEditorInput;
-import org.eclipse.epf.diagram.core.part.DiagramEditorInputProxy;
-import org.eclipse.epf.diagram.core.part.DiagramFileEditorInputProxy;
-import org.eclipse.epf.diagramming.base.commands.CreateDiagramCommand;
-import org.eclipse.epf.diagramming.base.persistence.DiagramFileCreatorEx;
-import org.eclipse.epf.diagramming.base.persistence.DiagramService;
-import org.eclipse.epf.diagramming.base.persistence.IDiagramService;
-import org.eclipse.epf.diagramming.part.EPFDiagramEditorPlugin;
-import org.eclipse.epf.diagramming.part.UMLDiagramFileCreator;
-import org.eclipse.epf.library.LibraryService;
-import org.eclipse.epf.library.edit.process.BreakdownElementWrapperItemProvider;
-import org.eclipse.epf.library.edit.process.command.ActivityDropCommand;
-import org.eclipse.epf.library.edit.util.IDiagramManager;
-import org.eclipse.epf.library.edit.util.TngUtil;
-import org.eclipse.epf.persistence.MethodLibraryPersister;
-import org.eclipse.epf.persistence.MultiFileSaveUtil;
-import org.eclipse.epf.uma.Activity;
-import org.eclipse.epf.uma.BreakdownElement;
-import org.eclipse.epf.uma.CapabilityPattern;
-import org.eclipse.epf.uma.DeliveryProcess;
-import org.eclipse.epf.uma.MethodElement;
-import org.eclipse.epf.uma.MethodPlugin;
-import org.eclipse.epf.uma.Process;
-import org.eclipse.epf.uma.util.UmaUtil;
-import org.eclipse.gmf.runtime.common.core.command.CommandResult;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.DiagramEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.parts.IDiagramWorkbenchPart;
-import org.eclipse.gmf.runtime.diagram.ui.resources.editor.ide.util.IDEEditorUtil;
-import org.eclipse.gmf.runtime.diagram.ui.resources.editor.parts.DiagramDocumentEditor;
-import org.eclipse.gmf.runtime.diagram.ui.resources.editor.util.DiagramFileCreator;
-import org.eclipse.gmf.runtime.diagram.ui.resources.editor.util.EditorUtil;
-import org.eclipse.gmf.runtime.emf.commands.core.command.AbstractTransactionalCommand;
-import org.eclipse.gmf.runtime.emf.core.GMFEditingDomainFactory;
-import org.eclipse.gmf.runtime.notation.Diagram;
-import org.eclipse.jface.operation.IRunnableContext;
-import org.eclipse.jface.operation.IRunnableWithProgress;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.ui.IEditorDescriptor;
-import org.eclipse.ui.IEditorInput;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.IFileEditorInput;
-import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.PartInitException;
-import org.eclipse.ui.ide.IDE;
-
-
-/**
- * 
- * @author Shashidhar Kannoori
- * @author Shilpa Toraskar
- * @author Phong Nguyen Le
- */
-public class DiagramEditorUtil extends IDEEditorUtil {
-
-	public static final String kind = "AD";
-	public static final String default_file_name = "diagram";
-	public static final String create_diagram_label = "Create diagram and model";
-	private static final String AD_EDITOR_ID = "org.eclipse.epf.diagramming.part.DiagramEditorID"; //$NON-NLS-1$
-
-	private static String getEditorId(int diagramType) {
-		switch(diagramType) {
-		case IDiagramManager.ACTIVITY_DIAGRAM:
-			return AD_EDITOR_ID;
-		}
-		return null;
-	}
-	
-	public static IEditorPart openDiagramEditor(IWorkbenchPage page, DiagramEditorInput input, IProgressMonitor progressMonitor) {
-		DiagramEditorInputProxy diagramFileEditorInput = new DiagramEditorInputProxy(input, EPFDiagramEditorPlugin.DIAGRAM_PREFERENCES_HINT);
-
-		IEditorPart editorPart = null;
-		try {
-			editorPart = page.openEditor(diagramFileEditorInput, getEditorId(input.getDiagramType()), true);
-		} catch (PartInitException e) {
-			CommonPlugin.getDefault().getLogger().logError(e);
-		}
-
-		// initialize the diagram by synchronizing it with library data
-		//
-		if(editorPart instanceof IDiagramWorkbenchPart) {
-			DiagramEditPart editPart = ((IDiagramWorkbenchPart)editorPart).getDiagramEditPart();
-			((DiagramDocumentEditor)editorPart).getDocumentProvider().setCanSaveDocument(diagramFileEditorInput);
-			initialize((Diagram) editPart.getModel(), diagramFileEditorInput);
-		}
-		return editorPart;
-	}
-
-	/**
-	 * To open a diagram and create a file.
-	 * @written
-	 */
-	public static void openDiagramEditor(IWorkbenchPage page, IEditorInput input){
-		
-		MethodElement process = (MethodElement)((DiagramEditorInput)input).getMethodElement();
-		IPath containerPath = getContainerPath(process);
-		
-		createAndOpenDiagram(
-				UMLDiagramFileCreator.getInstance(), containerPath, default_file_name,
-				EditorUtil.getInitialContents(), kind, page, new NullProgressMonitor(),
-				true, false, input);
-	}
-	
-	
-	/**
-	 * @generated
-	 */
-	public static final IFile createAndOpenDiagram(
-			DiagramFileCreator diagramFileCreator, IPath containerPath,
-			String fileName, InputStream initialContents, String kind,
-			IWorkbenchPage page, IProgressMonitor progressMonitor,
-			boolean openEditor, boolean saveDiagram, IEditorInput input) {
-		
-		IFile diagramFile = getFile(fileName, input, diagramFileCreator) ;
-		if(diagramFile == null){
-			diagramFile = createNewDiagramFile(
-				diagramFileCreator, containerPath, fileName, initialContents,
-				kind, page.getWorkbenchWindow().getShell(), progressMonitor, input);
-		}else{
-			
-		}
-		
-//		DiagramFileEditorInput diagramFileEditorInput = new DiagramFileEditorInput(
-//				diagramFile, (DiagramEditorInput)input);
-		DiagramFileEditorInputProxy diagramFileEditorInput = new DiagramFileEditorInputProxy(
-				diagramFile, (DiagramEditorInput)input, null);
-		
-		if (diagramFile != null && openEditor) {
-			IEditorPart editorPart = doOpenDiagramEditor(diagramFileEditorInput, page, saveDiagram, progressMonitor);
-			
-			// initialize the diagram by synchronizing it with library data
-			//
-			if(editorPart instanceof IDiagramWorkbenchPart) {
-				DiagramEditPart editPart = ((IDiagramWorkbenchPart)editorPart).getDiagramEditPart();
-				initialize((Diagram) editPart.getModel(), diagramFileEditorInput);
-			}
-			// remove the dirty flag
-			//
-//			if(editorPart instanceof IDocumentEditor) {
-//				IDocumentProvider dp = ((IDocumentEditor)editorPart).getDocumentProvider();
-//				if(dp instanceof DiagramEditorDocumentProvider) {
-//					((DiagramEditorDocumentProvider)dp).unsetCanSaveDocument(editorPart.getEditorInput());
-//				}
-//			}
-		}
-		return diagramFile;
-	}
-	
-	private static void initialize(Diagram model, DiagramFileEditorInputProxy diagramFileEditorInput) {
-		BreakdownElementWrapperItemProvider wrapper = diagramFileEditorInput.getDiagramEditorInput().getWrapper();
-		ActivityDiagramAdapter adapter = wrapper != null ?
-				new ActivityDiagramAdapter(wrapper) : 
-					new ActivityDiagramAdapter((Activity)diagramFileEditorInput.getDiagramEditorInput().getMethodElement());
-		adapter.setEditingDomain((InternalTransactionalEditingDomain) diagramFileEditorInput.getEditingDomain());
-		adapter.setSuppression(diagramFileEditorInput.getDiagramEditorInput().getSuppression());
-		adapter.setView(model);
-		model.getElement().eAdapters().add(adapter);
-		adapter.populateDiagram();
-	}
-
-
-	/**
-	 * <p>
-	 * This method should be called within a workspace modify operation since it creates resources.
-	 * </p>
-	 * @modified
-	 * @return the created file resource, or <code>null</code> if the file was not created
-	 */
-	public static final IFile createNewDiagramFile(
-			DiagramFileCreator diagramFileCreator, IPath containerFullPath,
-			String fileName, InputStream initialContents, String kind,
-			Shell shell, IProgressMonitor progressMonitor, IEditorInput input) {
-		progressMonitor.beginTask("Creating notation diagram and model file", 4); //$NON-NLS-1$
-		final IProgressMonitor subProgressMonitor = new SubProgressMonitor(
-				progressMonitor, 1);
-		final IFile diagramFile = diagramFileCreator.createNewFile(
-				containerFullPath, fileName, initialContents, shell,
-				new IRunnableContext() {
-					public void run(boolean fork, boolean cancelable,
-							IRunnableWithProgress runnable)
-							throws InvocationTargetException,
-							InterruptedException {
-						runnable.run(subProgressMonitor);
-					}
-				});
-		
-		createDiagramContent(diagramFile, progressMonitor, input);
-		return diagramFile;
-	}
-	
-	/**
-	 * Creates a diagram file content - GMF notation Diagram and UML Activity,
-	 * UMA bridge.
-	 * 
-	 */
-	public static boolean createDiagramContent(IFile diagramFile, IProgressMonitor progressMonitor, IEditorInput input) {
-
-		TransactionalEditingDomain editingDomain = GMFEditingDomainFactory.INSTANCE
-				.createEditingDomain();
-		ResourceSet resourceSet = editingDomain.getResourceSet();
-		final Resource diagramResource = resourceSet
-				.createResource(URI.createPlatformResourceURI(diagramFile
-						.getFullPath().toString()));
-		List affectedFiles = new ArrayList();
-		affectedFiles.add(diagramFile);
-		CreateDiagramCommand command = new CreateDiagramCommand(editingDomain,
-				"Creating diagram and model", affectedFiles, input,
-				diagramResource, kind);
-		try {
-			OperationHistoryFactory.getOperationHistory().execute(command,
-					new SubProgressMonitor(progressMonitor, 1), null);
-		} catch (ExecutionException e) {
-			EPFDiagramEditorPlugin.getInstance().logError(
-					"Unable to create model and diagram", e); //$NON-NLS-1$
-			return false;
-		}
-		return true;
-	}
-	
-	/**
-	 * Creates a diagram file content - GMF notation Diagram and UML Activity,
-	 * UMA bridge.
-	 * 
-	 */
-	public static boolean createDiagramContent(TransactionalEditingDomain editingDomain,
-			IFile diagramFile, IProgressMonitor progressMonitor, IEditorInput input,
-			Resource resource) {
-
-//		TransactionalEditingDomain editingDomain = GMFEditingDomainFactory.INSTANCE
-//				.createEditingDomain();
-//		ResourceSet resourceSet = editingDomain.getResourceSet();
-//		final Resource diagramResource = resourceSet
-//				.createResource(URI.createPlatformResourceURI(diagramFile
-//						.getFullPath().toString()));
-		List affectedFiles = new ArrayList();
-		affectedFiles.add(diagramFile);
-		CreateDiagramCommand command = new CreateDiagramCommand(editingDomain,
-				"Creating diagram and model", affectedFiles, input,
-				resource, kind);
-		try {
-			OperationHistoryFactory.getOperationHistory().execute(command,
-					new SubProgressMonitor(progressMonitor, 1), null);
-		} catch (ExecutionException e) {
-			EPFDiagramEditorPlugin.getInstance().logError(
-					"Unable to create model and diagram", e); //$NON-NLS-1$
-			return false;
-		}
-		return true;
-	}
-	/**
-	 * @written
-	 */
-	public static IPath getContainerPath(){
-		IPath path = EditorUtil.getDefaultDiagramPath(null, null);
-		if (path == null) {
-				IWorkspaceRoot root = ResourcesPlugin.getWorkspace().getRoot();
-				IProject[] projects = root.getProjects();
-
-				path = root.getFullPath();
-
-				for (int i = 0; i < projects.length; ++i) {
-					IProject project = projects[i];
-
-					if (project.isOpen()) {
-						path = project.getFullPath();
-						break;
-					}
-				}
-		}
-		return path;
-	}
-	
-	/**
-	 * Opens the diagram in an IEditorPart
-	 *  
-	 * @param file IFile that contains the diagram
-	 * @param dWindow the workbench window
-	 * @param saveDiagram true to save the diagram after opening, false to not
-	 * save it.
-	 * @param progressMonitor used when opening the diagram.
-	 * For now, it is only used when the diagram is being saved after opening.
-	 *  
-	 * @return DiagramEditPart for the diagram opened in an IEditorPart.
-	 */
-	public static final DiagramEditPart openDiagramEditor(IFileEditorInput input,
-			IWorkbenchPage page, boolean saveDiagram,
-			IProgressMonitor progressMonitor) {
-		IEditorPart editorPart = doOpenDiagramEditor(input, page, saveDiagram, progressMonitor);
-		if(editorPart instanceof IDiagramWorkbenchPart) {
-			return ((IDiagramWorkbenchPart)editorPart).getDiagramEditPart();
-		}
-		return null;
-	}
-	
-	public static final IEditorPart doOpenDiagramEditor(IFileEditorInput input,
-			IWorkbenchPage page, boolean saveDiagram,
-			IProgressMonitor progressMonitor) {
-		IEditorPart editorPart = null;
-		try {
-			//IWorkbenchPage page = dWindow.getActivePage();
-			IEditorPart parent = page.getActiveEditor();
-			if (page != null) {
-				editorPart = openEditor(page, input, true,true);
-				if(editorPart != null && parent != null){
-					// set the parent.
-				}
-				// set Active page editor as parent.
-				if (saveDiagram)
-					editorPart.doSave(progressMonitor);
-			}
-			input.getFile().refreshLocal(IResource.DEPTH_ZERO, null);
-			return editorPart;
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-
-		return null;
-	}
-	
-	/**
-     * Opens an editor on the given file resource.  This method will attempt to
-	 * resolve the editor based on content-type bindings as well as traditional
-	 * name/extension bindings if <code>determineContentType</code> is
-	 * <code>true</code>.
-     * <p>
-     * If the page already has an editor open on the target object then that
-     * editor is brought to front; otherwise, a new editor is opened. If
-     * <code>activate == true</code> the editor will be activated.
-     * <p>
-     * @param page
-     *            the page in which the editor will be opened
-     * @param input
-     *            the editor input
-     * @param activate
-     * 			  if <code>true</code> the editor will be activated
-     * @param determineContentType
-     * 			  attempt to resolve the content type for this file
-     * @return an open editor or <code>null</code> if an external editor was
-     *         opened
-     * @exception PartInitException
-     *                if the editor could not be initialized
-     * @see org.eclipse.ui.IWorkbenchPage#openEditor(org.eclipse.ui.IEditorInput,
-     *      String, boolean)
-     * @since 3.1
-     */
-	public static IEditorPart openEditor(IWorkbenchPage page, IFileEditorInput input,
-            boolean activate, boolean determineContentType) throws PartInitException {
-        //sanity checks
-        if (page == null) {
-			throw new IllegalArgumentException();
-		}
-
-        // open the editor on the file
-        IEditorDescriptor editorDesc = IDE.getEditorDescriptor(input.getFile(), determineContentType);
-        return page.openEditor(input, editorDesc.getId(),
-                activate);
-    }
-	
-	/**
-	 * Check whether file exists or not.
-	 * @param szFileName
-	 * @param input
-	 * @param diagramFileCreator
-	 * @return
-	 */
-	public static IFile getFile(String szFileName, IEditorInput input, DiagramFileCreator diagramFileCreator){
-		
-		MethodElement e = ((DiagramEditorInput)input).getMethodElement();
-		Process srcProc = TngUtil.getOwningProcess((BreakdownElement) e);
-		
-		IPath containerPath = getContainerPath(e);
-		String szNewFileName = szFileName;		
-		IPath filePath = containerPath.append(diagramFileCreator.appendExtensionToFileName(szNewFileName));
-//		IWorkspaceRoot workspaceRoot = ResourcesPlugin.getWorkspace().getRoot();
-//		if(workspaceRoot.exists(filePath)){
-//			IFile file = ResourcesPlugin.getWorkspace().getRoot().getFile(filePath);
-//			if(file.exists()){
-//				return null;
-//			}
-//		}
-		File libDirs = new File(LibraryService.getInstance().getCurrentMethodLibraryPath());
-		String diagramPath = libDirs.getAbsolutePath() + File.separator
-								+ MethodLibraryPersister.getElementPath(srcProc)
-								+ File.separator + srcProc.getName() + File.separator
-								+ "diagram.xmi";
-		File filex = new File(diagramPath);
-		if(filex.exists()){
-			return ResourcesPlugin.getWorkspace().getRoot().getFile(filePath);
-		}
-		return null;
-	}
-	
-	/**
-	 * 
-	 * 
-	 * @param proc
-	 * @return
-	 * @custom
-	 */
-	public static IPath getContainerPath(MethodElement e) {
-
-		Process proc = TngUtil.getOwningProcess(e);
-		// TODO handle the Wrapper Elements.
-		
-		if (proc instanceof Process) {
-			MethodPlugin plugin = UmaUtil.getMethodPlugin(proc);
-
-			String relativeDir;
-
-			if (proc instanceof CapabilityPattern) {
-				relativeDir = MultiFileSaveUtil.CAPABILITY_PATTERN_PATH;
-			} else if (proc instanceof DeliveryProcess) {
-				relativeDir = MultiFileSaveUtil.DELIVERY_PROCESS_PATH;
-			} else {
-				relativeDir = ""; //$NON-NLS-1$
-			}
-
-			IPath workspacePath = EditorUtil.getDefaultDiagramPath(null, null);
-			if (workspacePath == null) {
-				IWorkspaceRoot root = ResourcesPlugin.getWorkspace().getRoot();
-				IProject[] projects = root.getProjects();
-
-				workspacePath = root.getFullPath();
-
-				for (int i = 0; i < projects.length; ++i) {
-					IProject project = projects[i];
-
-					if (project.isOpen()) {
-						workspacePath = project.getFullPath();
-						break;
-					}
-				}
-			}
-
-			String libDir = workspacePath.toString();
-			String pluginDir = libDir + File.separator + plugin.getName();
-			String diagramDir = pluginDir + File.separator + relativeDir
-					+ File.separator + proc.getName() + File.separator;
-			//System.out.println("Print: " + diagramDir);
-			Path path = new Path(diagramDir);
-			return path;
-
-			//	 return workspacePath;
-		} else
-			return null;
-	} 
-
-	/**
-	 * Check whether file exists or not.
-	 * @param szFileName
-	 * @param input
-	 * @param diagramFileCreator
-	 * @return
-	 */
-	public static IFile getFile(String szFileName, BreakdownElement e, DiagramFileCreator diagramFileCreator){
-		
-		Process srcProc = TngUtil.getOwningProcess((BreakdownElement) e);
-		
-		IPath containerPath = getContainerPath(e);
-		String szNewFileName = szFileName;		
-		IPath filePath = containerPath.append(diagramFileCreator.appendExtensionToFileName(szNewFileName));
-//		IWorkspaceRoot workspaceRoot = ResourcesPlugin.getWorkspace().getRoot();
-//		if(workspaceRoot.exists(filePath)){
-//			IFile file = ResourcesPlugin.getWorkspace().getRoot().getFile(filePath);
-//			if(file.exists()){
-//				return null;
-//			}
-//		}
-		File libDirs = new File(LibraryService.getInstance().getCurrentMethodLibraryPath());
-		String diagramPath = libDirs.getAbsolutePath() + File.separator
-								+ MethodLibraryPersister.getElementPath(srcProc)
-								+ File.separator + srcProc.getName() + File.separator
-								+ "diagram.xmi";
-		File filex = new File(diagramPath);
-		if(filex.exists()){
-			return ResourcesPlugin.getWorkspace().getRoot().getFile(filePath);
-		}
-		return null;
-	}
-	
-	/**
-	 * This method should moved to LibraryEdit or Use NestedCommands using extension.
-	 * @param command2
-	 */
-	protected void copyDiagrams(ActivityDropCommand command2) {
-		// TODO Auto-generated method stub
-		TransactionalEditingDomain domain = IDiagramService.eInstance.createEditingDomain();
-		Helper copyHelper = new Helper();
-		Helper copiedHelper = command2.getActivityHandler().getCopyHelper();
-		Set keys = copiedHelper.keySet();
-		CompoundCommand command = new CompoundCommand(CompoundCommand.MERGE_COMMAND_ALL);
-		
-		for (Iterator iter = keys.iterator(); iter.hasNext();) {
-			EObject key = (EObject) iter.next();
-			EObject entry = (EObject)copiedHelper.get(key);
-			if(entry instanceof Activity && key instanceof Activity){
-				Activity act = (Activity)entry;
-				//TODO: Handle different diagrams.
-				Diagram diagram = IDiagramService.eInstance.getDiagram((Activity)key, DiagramService.AD_kind, 
-						false, new NullProgressMonitor());
-				if(diagram != null){
-//					CopyDiagramElementCommand cmd = new CopyDiagramElementCommand(
-//							domain,diagram.getElement(),copyHelper,act );
-//					command.append(cmd);
-				}
-			}
-		}
-		try{
-			command.execute();
-			Process p = command2.getActivityHandler().getTargetProcess();
-			// Need to move this code to different place.
-//			p.getBr
-			IFile file = DiagramEditorUtil.getFile(default_file_name, (BreakdownElement)p, DiagramFileCreatorEx.getInstance());
-			if(file == null){
-				file = createNewDiagramFile(DiagramFileCreatorEx.getInstance(), p, Display.getCurrent().getActiveShell(), 
-						new NullProgressMonitor());
-			}
-			Set xKeys = copyHelper.keySet();
-			for (Iterator iter = xKeys.iterator(); iter.hasNext();) {
-				EObject element = (EObject) iter.next();
-				if(element instanceof Diagram){
-					
-				}
-			}
-			List affectedFiles = new ArrayList();
-			affectedFiles.add(file);
-			AbstractTransactionalCommand cmd = new AbstractTransactionalCommand(
-					domain, "copy diagrams", affectedFiles) {
-			
-				protected CommandResult doExecuteWithResult(IProgressMonitor monitor,
-						IAdaptable info) throws ExecutionException {
-					return null;
-				}
-			
-			};
-			
-			
-		}catch(Exception e){
-			
-		}
-		finally{
-			command.dispose();
-		}
-	}
-
-	/**
-	 * <p>
-	 * This method should be called within a workspace modify operation since it creates resources.
-	 * </p>
-	 * @modified
-	 * @return the created file resource, or <code>null</code> if the file was not created
-	 */
-	public static final IFile createNewDiagramFile(
-			DiagramFileCreatorEx diagramFileCreator, BreakdownElement element, 
-			Shell shell, IProgressMonitor progressMonitor ) {
-		
-		final IPath containerPath = getContainerPath(element);
-		final String diagramFileName = DiagramFileCreatorEx.default_diagram_file;
-		progressMonitor.beginTask("Creating notation diagram and model file", 4); //$NON-NLS-1$
-		final IProgressMonitor subProgressMonitor = new SubProgressMonitor(
-				progressMonitor, 1);
-		final IFile diagramFile = diagramFileCreator.createNewFile(
-				containerPath, diagramFileName, 
-				getInitialContents(), shell,
-				new IRunnableContext() {
-					public void run(boolean fork, boolean cancelable,
-							IRunnableWithProgress runnable)
-							throws InvocationTargetException,
-							InterruptedException {
-						runnable.run(subProgressMonitor);
-					}
-				});
-		
-		//createDiagramContent(diagramFile, progressMonitor, input);
-		progressMonitor.done();
-		return diagramFile;
-	}
-}
diff --git a/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/base/util/IDiagramChangeListener.java b/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/base/util/IDiagramChangeListener.java
deleted file mode 100644
index e851503..0000000
--- a/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/base/util/IDiagramChangeListener.java
+++ /dev/null
@@ -1,25 +0,0 @@
-//------------------------------------------------------------------------------
-// Copyright (c) 2005, 2007 IBM Corporation 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:
-// IBM Corporation - initial implementation
-//------------------------------------------------------------------------------
-/**
- * 
- */
-package org.eclipse.epf.diagramming.base.util;
-
-import org.eclipse.emf.common.notify.Adapter;
-import org.eclipse.gmf.runtime.notation.Diagram;
-
-/**
- * @author Shashidhar Kannoori
- *
- */
-public interface IDiagramChangeListener extends Adapter {
-	public Diagram getDiagram();
-}
diff --git a/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/base/util/IViewChangeListener.java b/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/base/util/IViewChangeListener.java
deleted file mode 100644
index 04094f6..0000000
--- a/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/base/util/IViewChangeListener.java
+++ /dev/null
@@ -1,29 +0,0 @@
-//------------------------------------------------------------------------------
-// Copyright (c) 2005, 2007 IBM Corporation 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:
-// IBM Corporation - initial implementation
-//------------------------------------------------------------------------------
-/**
- * 
- */
-package org.eclipse.epf.diagramming.base.util;
-
-import org.eclipse.emf.common.notify.Adapter;
-import org.eclipse.gmf.runtime.notation.View;
-
-/**
- *  Listens to changes in View. Similar to Old Diagram code.
- *  Replica of INodeChangeListener(of epf diagram)
- *	Shashidhar Kannoori
- */
-public interface IViewChangeListener extends Adapter {
-	
-	public View getView();
-	
-	public Object getObject();
-}
diff --git a/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/base/util/UmaUmlUtil.java b/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/base/util/UmaUmlUtil.java
deleted file mode 100644
index c07af6a..0000000
--- a/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/base/util/UmaUmlUtil.java
+++ /dev/null
@@ -1,117 +0,0 @@
-//------------------------------------------------------------------------------
-// Copyright (c) 2005, 2007 IBM Corporation 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:
-// IBM Corporation - initial implementation
-//------------------------------------------------------------------------------
-/**
- * 
- */
-package org.eclipse.epf.diagramming.base.util;
-
-import org.eclipse.emf.ecore.EAnnotation;
-import org.eclipse.emf.ecore.EcoreFactory;
-import org.eclipse.epf.diagramming.base.Constants;
-import org.eclipse.epf.library.ILibraryManager;
-import org.eclipse.epf.library.LibraryService;
-import org.eclipse.epf.uma.Activity;
-import org.eclipse.epf.uma.MethodElement;
-import org.eclipse.epf.uma.UmaFactory;
-import org.eclipse.epf.uma.util.UmaUtil;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.uml2.uml.NamedElement;
-
-/**
- * @author Shashidhar kannoori
- *
- */
-public final class UmaUmlUtil {
-
-	/**
-	 * 
-	 */
-	public UmaUmlUtil() {
-		// TODO Auto-generated constructor stub
-	}
-	public static String getUmaGuidFromUmlElement(NamedElement ne){
-		EAnnotation eAnnotation = ne.getEAnnotation(Constants.UMA_SOURCE);
-		if(eAnnotation != null){
-			String guid = (String) eAnnotation.getDetails().get(
-					Constants.UMA_ELEMENT_GUID);
-			return guid;
-		}
-		return null;
-	}
-	
-	public static void createEAnnotationForUml(NamedElement element, String guid){
-		if(element.getEAnnotation(Constants.UMA_SOURCE) == null){
-			EAnnotation eAnnotation = EcoreFactory.eINSTANCE.createEAnnotation();
-			eAnnotation.setSource(Constants.UMA_SOURCE);
-			eAnnotation.getDetails().put(Constants.UMA_ELEMENT_GUID, guid);
-			element.getEAnnotations().add(eAnnotation);
-		}
-	}
-	
-	public static void updateEAnnotationForUml(NamedElement element, String guid){
-		EAnnotation eAnnotation = element.getEAnnotation(Constants.UMA_SOURCE);
-		if(eAnnotation == null){
-			createEAnnotationForUml(element, guid);
-		}else{
-			eAnnotation.getDetails().put(Constants.UMA_ELEMENT_GUID, guid);
-		}
-	}
-	
-	public static MethodElement getUmaElement(NamedElement umlElement){
-
-		String umaGuid = getUmaGuidFromUmlElement(umlElement);
-		if(umaGuid != null && umaGuid != ""){
-			ILibraryManager manager = LibraryService.getInstance().getCurrentLibraryManager();
-			if(manager != null){
-				MethodElement element = manager.getMethodElement(umaGuid);
-				return element;
-			}
-		}
-		return null;
-	}
-	
-	public static MethodElement getUmaElement(View view){
-		
-		NamedElement umlElement = (NamedElement)view.getElement();
-		String umaGuid = getUmaGuidFromUmlElement(umlElement);
-		if(umaGuid != null && umaGuid != ""){
-			ILibraryManager manager = LibraryService.getInstance().getCurrentLibraryManager();
-			if(manager != null){
-				MethodElement element = manager.getMethodElement(umaGuid);
-				return element;
-			}
-		}
-		return null;
-	}
-	
-	public static void createUmaObject(View containerView, View view) {
-		// TODO Auto-generated method stub
-		EAnnotation eAnnotation = containerView
-				.getEAnnotation(Constants.UMA_SOURCE);
-		String guid = (String) eAnnotation.getDetails().get(
-				Constants.UMA_ELEMENT_GUID);
-		ILibraryManager manager = LibraryService.getInstance().getCurrentLibraryManager();
-		if (manager != null) {
-			MethodElement element = manager.getMethodElement(guid);
-			if(element instanceof Activity){
-				Activity subactivity = UmaFactory.eINSTANCE.createActivity();
-				((Activity)element).getBreakdownElements().add(subactivity);
-				String subId = UmaUtil.generateGUID();
-				subactivity.setGuid(subId);
-				EAnnotation eAnnotation2 = EcoreFactory.eINSTANCE
-				.createEAnnotation();
-				eAnnotation2.setSource(Constants.UMA_SOURCE);
-				eAnnotation2.getDetails().put(Constants.UMA_ELEMENT_GUID, subId);
-				view.getEAnnotations().add(eAnnotation2);
-			}
-		}
-	}
-}
diff --git a/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/base/util/ValidationUtil.java b/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/base/util/ValidationUtil.java
deleted file mode 100644
index e1f3295..0000000
--- a/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/base/util/ValidationUtil.java
+++ /dev/null
@@ -1,29 +0,0 @@
-//------------------------------------------------------------------------------
-// Copyright (c) 2005, 2007 IBM Corporation 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:
-// IBM Corporation - initial implementation
-//------------------------------------------------------------------------------
-/**
- * 
- */
-package org.eclipse.epf.diagramming.base.util;
-
-/**
- * @author skannoor
- *
- */
-public class ValidationUtil {
-
-	/**
-	 * 
-	 */
-	public ValidationUtil() {
-		// TODO Auto-generated constructor stub
-	}
-
-}
diff --git a/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/base/view/DiagramImpl.java b/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/base/view/DiagramImpl.java
deleted file mode 100644
index 9f5e1cb..0000000
--- a/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/base/view/DiagramImpl.java
+++ /dev/null
@@ -1,263 +0,0 @@
-//------------------------------------------------------------------------------
-// Copyright (c) 2005, 2007 IBM Corporation 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:
-// IBM Corporation - initial implementation
-//------------------------------------------------------------------------------
-/**
- * 
- */
-package org.eclipse.epf.diagramming.base.view;
-
-import java.util.Collection;
-import java.util.Iterator;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.impl.AdapterImpl;
-import org.eclipse.emf.ecore.EModelElement;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.epf.diagram.core.bridge.BridgeHelper;
-import org.eclipse.epf.diagramming.base.util.DiagramChangeListener;
-import org.eclipse.epf.diagramming.base.util.IDiagramChangeListener;
-import org.eclipse.epf.diagramming.base.util.UmaUmlUtil;
-import org.eclipse.epf.library.edit.IFilter;
-import org.eclipse.epf.library.edit.process.BSActivityItemProvider;
-import org.eclipse.epf.library.edit.process.BreakdownElementWrapperItemProvider;
-import org.eclipse.epf.library.edit.process.IBSItemProvider;
-import org.eclipse.epf.library.edit.util.ProcessUtil;
-import org.eclipse.epf.library.edit.util.Suppression;
-import org.eclipse.epf.uma.Activity;
-import org.eclipse.epf.uma.MethodElement;
-import org.eclipse.epf.uma.UmaPackage;
-import org.eclipse.gmf.runtime.notation.Diagram;
-import org.eclipse.gmf.runtime.notation.NotationPackage;
-import org.eclipse.uml2.uml.NamedElement;
-
-/**
- * Extended implementation of {@link org.eclipse.gmf.runtime.notation.impl.DiagramImpl}
- * to add adapters to UMA {@link MethodElement} and {@link Diagram}   
- * 
- * Not Useful , not complete. Temporary solution. Defect at time of resource load.
- * 
- * @author Shashidhar Kannoori
- */
-public class DiagramImpl extends
-		org.eclipse.gmf.runtime.notation.impl.DiagramImpl {
-
-	Object object;
-	private boolean notificationEnabled = true; 
-	private boolean readOnly = false;
-	protected IDiagramChangeListener diagramChangeListener;
-	private Activity baseAct;
-	
-	// still need to use below these
-	private Suppression suppression;
-	protected BreakdownElementWrapperItemProvider wrapper;
-	protected IFilter filter;
-	
-	public DiagramImpl() {
-	}
-	
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.gmf.runtime.notation.impl.ViewImpl#setElement(org.eclipse.emf.ecore.EObject)
-	 */
-	public void setElement(EObject newElement) {
-		super.setElement(newElement);
-		// Check for BreakdownElementWrapperItemProvider and readonly.
-		object = BridgeHelper.getMethodElementFromAnnotation((EModelElement)newElement);
-		if (object != null) {
-			Activity e = (Activity) object;
-			if (ProcessUtil.isExtendingOrLocallyContributing(e)) {
-				baseAct = (Activity) e.getVariabilityBasedOnElement();
-			}
-			baseAct = null;
-			
-			if(diagramChangeListener ==null){
-				diagramChangeListener = new ActivityDiagramChangeListener(e, this);
-			}
-
-			if(diagramChangeListener != null){
-				e.eAdapters().add(diagramChangeListener);
-			}
-			
-			if (baseAct != null) {
-				baseAct.eAdapters().add(diagramChangeListener);
-			}
-			this.eAdapters().add(new DiagramNotationChangeListener());
-		}
-	}
-	
-	/**
-	 * To set the UmaElement object can be {@link Activity} or {@link BreakdownElementWrapperItemProvider}
-	 */
-	public void setUmaElement(Object object){
-		this.object = object;
-	}
-	
-
-	/**
-	 * 
-	 * @author Shashidhar Kannoori
-	 *
-	 */
-	public class ActivityDiagramChangeListener extends DiagramChangeListener{
-		public ActivityDiagramChangeListener(MethodElement e, Diagram d) {
-			super(e, d);
-		}
-		public void notifyChanged(Notification msg) {
-			if (!notificationEnabled )
-				return;
-			notificationEnabled = false;
-			try {
-				//Object obj;
-				switch (msg.getFeatureID(Activity.class)) {
-				case UmaPackage.ACTIVITY__BREAKDOWN_ELEMENTS:
-					switch (msg.getEventType()) {
-					case Notification.ADD:
-						System.out.println("Notification Add");
-						break;
-					case Notification.REMOVE:
-						System.out.println("Notification Removed");
-						break;
-					case Notification.ADD_MANY:
-						System.out.println("Notification ADD_MANY");
-						break;
-					case Notification.REMOVE_MANY:
-						System.out.println("Notification REMOVE_MANY");
-						break;
-					case Notification.MOVE:
-						System.out.println("Notification MOVE");
-						break;
-					}
-					break;
-				}
-			}
-			finally {
-				notificationEnabled = true;
-			}
-			super.notifyChanged(msg);
-		}
-	}
-	
-	/**
-	 * 
-	 * @author Shashidhar Kannoori
-	 *
-	 */
-	public class DiagramNotationChangeListener extends AdapterImpl{
-		
-		public void notifyChanged(Notification msg) {
-			if (!notificationEnabled)
-				return;
-			notificationEnabled = false;
-			try {
-				//Activity act = (Activity) getObject();
-				switch (msg.getFeatureID(Diagram.class)) {
-				case NotationPackage.DIAGRAM__PERSISTED_CHILDREN:
-					// System.out.println(".notifyChanged(): index=" +
-					// msg.getPosition());
-					Collection collection;
-					switch (msg.getEventType()) {
-					case Notification.ADD:
-						nodeAdded(msg.getPosition(), msg
-								.getNewValue());
-						return;
-					case Notification.REMOVE:
-						nodeRemoved(msg.getOldValue());
-						return;
-					case Notification.ADD_MANY:
-						collection = (Collection) msg.getNewValue();
-						for (Iterator iter = collection.iterator(); iter
-								.hasNext();) {
-							Object node =  iter.next();
-							nodeAdded(msg.getPosition(), node);
-						}
-
-						return;
-					case Notification.REMOVE_MANY:
-						collection = (Collection) msg.getOldValue();
-						for (Iterator iter = collection.iterator(); iter
-								.hasNext();) {
-							nodeRemoved(iter.next());
-						}
-						return;
-					}
-
-				}
-			} finally {
-				notificationEnabled = true;
-			}
-		}
-	}
-
-
-	public void nodeAdded(int position, Object object) {
-		// TODO Auto-generated method stub
-		System.out.println("Notation notification add"+object);
-	}
-
-	public void nodeRemoved(Object object) {
-		// TODO Auto-generated method stub
-		System.out.println("Notation notification remove" + object);
-	}
-
-	public boolean isReadOnly() {
-		return readOnly;
-	}
-
-	public void setReadOnly(boolean readOnly) {
-		this.readOnly = readOnly;
-	}
-	
-	protected void extractChildren(ITreeItemContentProvider adapter, Object object, Collection children) {
-		// disable rollup before getting the children
-		//
-		boolean oldRolledUp = false;
-		if(adapter instanceof BSActivityItemProvider) {
-			BSActivityItemProvider itemProvider = (BSActivityItemProvider)adapter;
-			oldRolledUp = itemProvider.isRolledUp();
-			itemProvider.basicSetRolledUp(false);
-		}
-		else if(adapter instanceof IBSItemProvider){
-			IBSItemProvider itemProvider = (IBSItemProvider)adapter;
-			oldRolledUp = itemProvider.isRolledUp();
-			itemProvider.setRolledUp(false);
-		}
-		
-		try {
-			// filter out the suppressed elements
-			//
-			for (Iterator iter = adapter.getChildren(object).iterator(); iter.hasNext();) {
-				Object child = iter.next();
-				if(!getSuppression().isSuppressed(child)) {
-					children.add(child);
-				}
-			}
-			
-			// don't filter suppressed elements
-			//
-			//children.addAll(adapter.getChildren(object));
-		}
-		finally {
-			// restore the rolled-up flag
-			//
-			if(adapter instanceof IBSItemProvider) {
-				((IBSItemProvider)adapter).setRolledUp(oldRolledUp);
-			}
-		}
-	}
-	
-	public Suppression getSuppression() {
-		return suppression;
-	}
-
-	public void setSuppression(Suppression suppression) {
-		this.suppression = suppression;
-	}
-}
diff --git a/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/edit/commands/UMLReorientConnectionViewCommand.java b/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/edit/commands/UMLReorientConnectionViewCommand.java
deleted file mode 100644
index 259bd45..0000000
--- a/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/edit/commands/UMLReorientConnectionViewCommand.java
+++ /dev/null
@@ -1,93 +0,0 @@
-//------------------------------------------------------------------------------
-// Copyright (c) 2005, 2007 IBM Corporation 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:
-// IBM Corporation - initial implementation
-//------------------------------------------------------------------------------
-/*
- * Copyright (c) 2005, 2006 IBM Corporation 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:
- * IBM Corporation - initial implementation
- *
- */
-package org.eclipse.epf.diagramming.edit.commands;
-
-import java.util.List;
-
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.gmf.runtime.common.core.command.CommandResult;
-import org.eclipse.gmf.runtime.emf.commands.core.command.AbstractTransactionalCommand;
-import org.eclipse.gmf.runtime.notation.Edge;
-import org.eclipse.gmf.runtime.notation.View;
-
-/**
- * @generated
- */
-public class UMLReorientConnectionViewCommand extends
-		AbstractTransactionalCommand {
-
-	/**
-	 * @generated
-	 */
-	private IAdaptable edgeAdaptor;
-
-	/**
-	 * @generated
-	 */
-	public UMLReorientConnectionViewCommand(
-			TransactionalEditingDomain editingDomain, String label) {
-		super(editingDomain, label, null);
-	}
-
-	/**
-	 * @generated
-	 */
-	public List getAffectedFiles() {
-		View view = (View) edgeAdaptor.getAdapter(View.class);
-		if (view != null) {
-			return getWorkspaceFiles(view);
-		}
-		return super.getAffectedFiles();
-	}
-
-	/**
-	 * @generated
-	 */
-	public IAdaptable getEdgeAdaptor() {
-		return edgeAdaptor;
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setEdgeAdaptor(IAdaptable edgeAdaptor) {
-		this.edgeAdaptor = edgeAdaptor;
-	}
-
-	/**
-	 * @modified
-	 * 	 */
-	protected CommandResult doExecuteWithResult(
-			IProgressMonitor progressMonitor, IAdaptable info) {
-		//    assert null != edgeAdaptor : "Null child in UMLReorientConnectionViewCommand"; //$NON-NLS-1$
-		Edge edge = (Edge) getEdgeAdaptor().getAdapter(Edge.class);
-		//    assert null != edge : "Null edge in UMLReorientConnectionViewCommand"; //$NON-NLS-1$
-
-		View tempView = edge.getSource();
-		edge.setSource(edge.getTarget());
-		edge.setTarget(tempView);
-
-		return CommandResult.newOKCommandResult();
-	}
-}
diff --git a/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/edit/helpers/ActivityEditHelper.java b/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/edit/helpers/ActivityEditHelper.java
deleted file mode 100644
index 49690bf..0000000
--- a/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/edit/helpers/ActivityEditHelper.java
+++ /dev/null
@@ -1,28 +0,0 @@
-//------------------------------------------------------------------------------
-// Copyright (c) 2005, 2007 IBM Corporation 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:
-// IBM Corporation - initial implementation
-//------------------------------------------------------------------------------
-/*
- * Copyright (c) 2005, 2006 IBM Corporation 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:
- * IBM Corporation - initial implementation
- *
- */
-package org.eclipse.epf.diagramming.edit.helpers;
-
-/**
- * @generated
- */
-public class ActivityEditHelper extends UMLBaseEditHelper {
-}
\ No newline at end of file
diff --git a/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/edit/helpers/ActivityFinalNodeEditHelper.java b/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/edit/helpers/ActivityFinalNodeEditHelper.java
deleted file mode 100644
index 372fd06..0000000
--- a/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/edit/helpers/ActivityFinalNodeEditHelper.java
+++ /dev/null
@@ -1,28 +0,0 @@
-//------------------------------------------------------------------------------
-// Copyright (c) 2005, 2007 IBM Corporation 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:
-// IBM Corporation - initial implementation
-//------------------------------------------------------------------------------
-/*
- * Copyright (c) 2005, 2006 IBM Corporation 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:
- * IBM Corporation - initial implementation
- *
- */
-package org.eclipse.epf.diagramming.edit.helpers;
-
-/**
- * @generated
- */
-public class ActivityFinalNodeEditHelper extends UMLBaseEditHelper {
-}
\ No newline at end of file
diff --git a/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/edit/helpers/ActivityParameterNodeEditHelper.java b/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/edit/helpers/ActivityParameterNodeEditHelper.java
deleted file mode 100644
index 43d7bb8..0000000
--- a/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/edit/helpers/ActivityParameterNodeEditHelper.java
+++ /dev/null
@@ -1,28 +0,0 @@
-//------------------------------------------------------------------------------
-// Copyright (c) 2005, 2007 IBM Corporation 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:
-// IBM Corporation - initial implementation
-//------------------------------------------------------------------------------
-/*
- * Copyright (c) 2005, 2006 IBM Corporation 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:
- * IBM Corporation - initial implementation
- *
- */
-package org.eclipse.epf.diagramming.edit.helpers;
-
-/**
- * @generated
- */
-public class ActivityParameterNodeEditHelper extends UMLBaseEditHelper {
-}
\ No newline at end of file
diff --git a/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/edit/helpers/ActivityParameterNodeEditHelperAdvice.java b/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/edit/helpers/ActivityParameterNodeEditHelperAdvice.java
deleted file mode 100644
index 0d6dc28..0000000
--- a/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/edit/helpers/ActivityParameterNodeEditHelperAdvice.java
+++ /dev/null
@@ -1,31 +0,0 @@
-//------------------------------------------------------------------------------
-// Copyright (c) 2005, 2007 IBM Corporation 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:
-// IBM Corporation - initial implementation
-//------------------------------------------------------------------------------
-/*
- * Copyright (c) 2005, 2006 IBM Corporation 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:
- * IBM Corporation - initial implementation
- *
- */
-package org.eclipse.epf.diagramming.edit.helpers;
-
-import org.eclipse.gmf.runtime.emf.type.core.edithelper.AbstractEditHelperAdvice;
-
-/**
- * @generated
- */
-public class ActivityParameterNodeEditHelperAdvice extends
-		AbstractEditHelperAdvice {
-}
\ No newline at end of file
diff --git a/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/edit/helpers/ActivityPartitionEditHelper.java b/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/edit/helpers/ActivityPartitionEditHelper.java
deleted file mode 100644
index b97338d..0000000
--- a/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/edit/helpers/ActivityPartitionEditHelper.java
+++ /dev/null
@@ -1,28 +0,0 @@
-//------------------------------------------------------------------------------
-// Copyright (c) 2005, 2007 IBM Corporation 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:
-// IBM Corporation - initial implementation
-//------------------------------------------------------------------------------
-/*
- * Copyright (c) 2005, 2006 IBM Corporation 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:
- * IBM Corporation - initial implementation
- *
- */
-package org.eclipse.epf.diagramming.edit.helpers;
-
-/**
- * @generated
- */
-public class ActivityPartitionEditHelper extends UMLBaseEditHelper {
-}
\ No newline at end of file
diff --git a/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/edit/helpers/ActivityPartitionEditHelperAdvice.java b/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/edit/helpers/ActivityPartitionEditHelperAdvice.java
deleted file mode 100644
index 5218569..0000000
--- a/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/edit/helpers/ActivityPartitionEditHelperAdvice.java
+++ /dev/null
@@ -1,30 +0,0 @@
-//------------------------------------------------------------------------------
-// Copyright (c) 2005, 2007 IBM Corporation 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:
-// IBM Corporation - initial implementation
-//------------------------------------------------------------------------------
-/*
- * Copyright (c) 2005, 2006 IBM Corporation 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:
- * IBM Corporation - initial implementation
- *
- */
-package org.eclipse.epf.diagramming.edit.helpers;
-
-import org.eclipse.gmf.runtime.emf.type.core.edithelper.AbstractEditHelperAdvice;
-
-/**
- * @generated
- */
-public class ActivityPartitionEditHelperAdvice extends AbstractEditHelperAdvice {
-}
\ No newline at end of file
diff --git a/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/edit/helpers/ControlFlowEditHelper.java b/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/edit/helpers/ControlFlowEditHelper.java
deleted file mode 100644
index 1ebfed1..0000000
--- a/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/edit/helpers/ControlFlowEditHelper.java
+++ /dev/null
@@ -1,28 +0,0 @@
-//------------------------------------------------------------------------------
-// Copyright (c) 2005, 2007 IBM Corporation 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:
-// IBM Corporation - initial implementation
-//------------------------------------------------------------------------------
-/*
- * Copyright (c) 2005, 2006 IBM Corporation 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:
- * IBM Corporation - initial implementation
- *
- */
-package org.eclipse.epf.diagramming.edit.helpers;
-
-/**
- * @generated
- */
-public class ControlFlowEditHelper extends UMLBaseEditHelper {
-}
\ No newline at end of file
diff --git a/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/edit/helpers/DecisionNodeEditHelper.java b/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/edit/helpers/DecisionNodeEditHelper.java
deleted file mode 100644
index 68f1676..0000000
--- a/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/edit/helpers/DecisionNodeEditHelper.java
+++ /dev/null
@@ -1,28 +0,0 @@
-//------------------------------------------------------------------------------
-// Copyright (c) 2005, 2007 IBM Corporation 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:
-// IBM Corporation - initial implementation
-//------------------------------------------------------------------------------
-/*
- * Copyright (c) 2005, 2006 IBM Corporation 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:
- * IBM Corporation - initial implementation
- *
- */
-package org.eclipse.epf.diagramming.edit.helpers;
-
-/**
- * @generated
- */
-public class DecisionNodeEditHelper extends UMLBaseEditHelper {
-}
\ No newline at end of file
diff --git a/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/edit/helpers/ForkNodeEditHelper.java b/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/edit/helpers/ForkNodeEditHelper.java
deleted file mode 100644
index d454a6b..0000000
--- a/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/edit/helpers/ForkNodeEditHelper.java
+++ /dev/null
@@ -1,28 +0,0 @@
-//------------------------------------------------------------------------------
-// Copyright (c) 2005, 2007 IBM Corporation 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:
-// IBM Corporation - initial implementation
-//------------------------------------------------------------------------------
-/*
- * Copyright (c) 2005, 2006 IBM Corporation 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:
- * IBM Corporation - initial implementation
- *
- */
-package org.eclipse.epf.diagramming.edit.helpers;
-
-/**
- * @generated
- */
-public class ForkNodeEditHelper extends UMLBaseEditHelper {
-}
\ No newline at end of file
diff --git a/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/edit/helpers/InitialNodeEditHelper.java b/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/edit/helpers/InitialNodeEditHelper.java
deleted file mode 100644
index a4ac5ac..0000000
--- a/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/edit/helpers/InitialNodeEditHelper.java
+++ /dev/null
@@ -1,28 +0,0 @@
-//------------------------------------------------------------------------------
-// Copyright (c) 2005, 2007 IBM Corporation 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:
-// IBM Corporation - initial implementation
-//------------------------------------------------------------------------------
-/*
- * Copyright (c) 2005, 2006 IBM Corporation 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:
- * IBM Corporation - initial implementation
- *
- */
-package org.eclipse.epf.diagramming.edit.helpers;
-
-/**
- * @generated
- */
-public class InitialNodeEditHelper extends UMLBaseEditHelper {
-}
\ No newline at end of file
diff --git a/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/edit/helpers/JoinNodeEditHelper.java b/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/edit/helpers/JoinNodeEditHelper.java
deleted file mode 100644
index 06396f5..0000000
--- a/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/edit/helpers/JoinNodeEditHelper.java
+++ /dev/null
@@ -1,28 +0,0 @@
-//------------------------------------------------------------------------------
-// Copyright (c) 2005, 2007 IBM Corporation 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:
-// IBM Corporation - initial implementation
-//------------------------------------------------------------------------------
-/*
- * Copyright (c) 2005, 2006 IBM Corporation 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:
- * IBM Corporation - initial implementation
- *
- */
-package org.eclipse.epf.diagramming.edit.helpers;
-
-/**
- * @generated
- */
-public class JoinNodeEditHelper extends UMLBaseEditHelper {
-}
\ No newline at end of file
diff --git a/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/edit/helpers/MergeNodeEditHelper.java b/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/edit/helpers/MergeNodeEditHelper.java
deleted file mode 100644
index 90c1398..0000000
--- a/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/edit/helpers/MergeNodeEditHelper.java
+++ /dev/null
@@ -1,28 +0,0 @@
-//------------------------------------------------------------------------------
-// Copyright (c) 2005, 2007 IBM Corporation 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:
-// IBM Corporation - initial implementation
-//------------------------------------------------------------------------------
-/*
- * Copyright (c) 2005, 2006 IBM Corporation 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:
- * IBM Corporation - initial implementation
- *
- */
-package org.eclipse.epf.diagramming.edit.helpers;
-
-/**
- * @generated
- */
-public class MergeNodeEditHelper extends UMLBaseEditHelper {
-}
\ No newline at end of file
diff --git a/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/edit/helpers/ObjectNodeEditHelper.java b/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/edit/helpers/ObjectNodeEditHelper.java
deleted file mode 100644
index 215f23f..0000000
--- a/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/edit/helpers/ObjectNodeEditHelper.java
+++ /dev/null
@@ -1,28 +0,0 @@
-//------------------------------------------------------------------------------
-// Copyright (c) 2005, 2007 IBM Corporation 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:
-// IBM Corporation - initial implementation
-//------------------------------------------------------------------------------
-/*
- * Copyright (c) 2005, 2006 IBM Corporation 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:
- * IBM Corporation - initial implementation
- *
- */
-package org.eclipse.epf.diagramming.edit.helpers;
-
-/**
- * @generated
- */
-public class ObjectNodeEditHelper extends UMLBaseEditHelper {
-}
\ No newline at end of file
diff --git a/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/edit/helpers/StructuredActivityNode2EditHelperAdvice.java b/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/edit/helpers/StructuredActivityNode2EditHelperAdvice.java
deleted file mode 100644
index f23a754..0000000
--- a/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/edit/helpers/StructuredActivityNode2EditHelperAdvice.java
+++ /dev/null
@@ -1,31 +0,0 @@
-//------------------------------------------------------------------------------
-// Copyright (c) 2005, 2007 IBM Corporation 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:
-// IBM Corporation - initial implementation
-//------------------------------------------------------------------------------
-/*
- * Copyright (c) 2005, 2006 IBM Corporation 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:
- * IBM Corporation - initial implementation
- *
- */
-package org.eclipse.epf.diagramming.edit.helpers;
-
-import org.eclipse.gmf.runtime.emf.type.core.edithelper.AbstractEditHelperAdvice;
-
-/**
- * @generated
- */
-public class StructuredActivityNode2EditHelperAdvice extends
-		AbstractEditHelperAdvice {
-}
\ No newline at end of file
diff --git a/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/edit/helpers/StructuredActivityNodeEditHelper.java b/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/edit/helpers/StructuredActivityNodeEditHelper.java
deleted file mode 100644
index b013edf..0000000
--- a/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/edit/helpers/StructuredActivityNodeEditHelper.java
+++ /dev/null
@@ -1,28 +0,0 @@
-//------------------------------------------------------------------------------
-// Copyright (c) 2005, 2007 IBM Corporation 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:
-// IBM Corporation - initial implementation
-//------------------------------------------------------------------------------
-/*
- * Copyright (c) 2005, 2006 IBM Corporation 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:
- * IBM Corporation - initial implementation
- *
- */
-package org.eclipse.epf.diagramming.edit.helpers;
-
-/**
- * @generated
- */
-public class StructuredActivityNodeEditHelper extends UMLBaseEditHelper {
-}
\ No newline at end of file
diff --git a/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/edit/helpers/StructuredActivityNodeEditHelperAdvice.java b/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/edit/helpers/StructuredActivityNodeEditHelperAdvice.java
deleted file mode 100644
index fae5ae3..0000000
--- a/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/edit/helpers/StructuredActivityNodeEditHelperAdvice.java
+++ /dev/null
@@ -1,31 +0,0 @@
-//------------------------------------------------------------------------------
-// Copyright (c) 2005, 2007 IBM Corporation 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:
-// IBM Corporation - initial implementation
-//------------------------------------------------------------------------------
-/*
- * Copyright (c) 2005, 2006 IBM Corporation 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:
- * IBM Corporation - initial implementation
- *
- */
-package org.eclipse.epf.diagramming.edit.helpers;
-
-import org.eclipse.gmf.runtime.emf.type.core.edithelper.AbstractEditHelperAdvice;
-
-/**
- * @generated
- */
-public class StructuredActivityNodeEditHelperAdvice extends
-		AbstractEditHelperAdvice {
-}
\ No newline at end of file
diff --git a/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/edit/helpers/UMLBaseEditHelper.java b/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/edit/helpers/UMLBaseEditHelper.java
deleted file mode 100644
index f45972e..0000000
--- a/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/edit/helpers/UMLBaseEditHelper.java
+++ /dev/null
@@ -1,90 +0,0 @@
-//------------------------------------------------------------------------------
-// Copyright (c) 2005, 2007 IBM Corporation 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:
-// IBM Corporation - initial implementation
-//------------------------------------------------------------------------------
-/*
- * Copyright (c) 2005, 2006 IBM Corporation 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:
- * IBM Corporation - initial implementation
- *
- */
-package org.eclipse.epf.diagramming.edit.helpers;
-
-import org.eclipse.gmf.runtime.common.core.command.CompositeCommand;
-import org.eclipse.gmf.runtime.common.core.command.ICommand;
-import org.eclipse.gmf.runtime.emf.type.core.edithelper.AbstractEditHelper;
-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyReferenceRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.IEditCommandRequest;
-
-/**
- * @generated
- */
-public class UMLBaseEditHelper extends AbstractEditHelper {
-
-	/**
-	 * @generated
-	 */
-	public static final String EDIT_POLICY_COMMAND = "edit policy command"; //$NON-NLS-1$
-
-	/**
-	 * @generated
-	 */
-	protected ICommand getInsteadCommand(IEditCommandRequest req) {
-		ICommand epCommand = (ICommand) req.getParameter(EDIT_POLICY_COMMAND);
-		req.setParameter(EDIT_POLICY_COMMAND, null);
-		ICommand ehCommand = super.getInsteadCommand(req);
-		if (epCommand == null) {
-			return ehCommand;
-		}
-		if (ehCommand == null) {
-			return epCommand;
-		}
-		CompositeCommand command = new CompositeCommand(null);
-		command.add(epCommand);
-		command.add(ehCommand);
-		return command;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected ICommand getCreateCommand(CreateElementRequest req) {
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected ICommand getCreateRelationshipCommand(
-			CreateRelationshipRequest req) {
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected ICommand getDestroyElementCommand(DestroyElementRequest req) {
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected ICommand getDestroyReferenceCommand(DestroyReferenceRequest req) {
-		return null;
-	}
-}
\ No newline at end of file
diff --git a/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/edit/parts/ActivityEditPart.java b/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/edit/parts/ActivityEditPart.java
deleted file mode 100644
index a704042..0000000
--- a/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/edit/parts/ActivityEditPart.java
+++ /dev/null
@@ -1,70 +0,0 @@
-//------------------------------------------------------------------------------
-// Copyright (c) 2005, 2007 IBM Corporation 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:
-// IBM Corporation - initial implementation
-//------------------------------------------------------------------------------
-/*
- * Copyright (c) 2005, 2006 IBM Corporation 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:
- * IBM Corporation - initial implementation
- *
- */
-package org.eclipse.epf.diagramming.edit.parts;
-
-import org.eclipse.epf.diagramming.base.policies.ActivityXYLayoutEditPolicy;
-import org.eclipse.epf.diagramming.edit.policies.ActivityCanonicalEditPolicy;
-import org.eclipse.epf.diagramming.edit.policies.ActivityItemSemanticEditPolicy;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.DiagramEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
-import org.eclipse.gmf.runtime.notation.View;
-
-/**
- * @generated
- */
-public class ActivityEditPart extends DiagramEditPart {
-
-	/**
-	 * @generated
-	 */
-	public static String MODEL_ID = "AD"; //$NON-NLS-1$
-
-	/**
-	 * @generated
-	 */
-	public static final int VISUAL_ID = 79;
-
-	/**
-	 * @generated
-	 */
-	public ActivityEditPart(View view) {
-		super(view);
-	}
-
-	/**
-	 * @modified
-	 */
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE,
-				new ActivityItemSemanticEditPolicy());
-		installEditPolicy(EditPolicyRoles.CANONICAL_ROLE,
-				new ActivityCanonicalEditPolicy());
-
-		// modified START
-		installEditPolicy(EditPolicy.LAYOUT_ROLE,
-				new ActivityXYLayoutEditPolicy());
-		// modified END
-	}
-
-}
diff --git a/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/edit/parts/ActivityFinalNodeEditPart.java b/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/edit/parts/ActivityFinalNodeEditPart.java
deleted file mode 100644
index 72f8969..0000000
--- a/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/edit/parts/ActivityFinalNodeEditPart.java
+++ /dev/null
@@ -1,319 +0,0 @@
-//------------------------------------------------------------------------------
-// Copyright (c) 2005, 2007 IBM Corporation 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:
-// IBM Corporation - initial implementation
-//------------------------------------------------------------------------------
-/*
- * Copyright (c) 2005, 2006 IBM Corporation 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:
- * IBM Corporation - initial implementation
- *
- */
-package org.eclipse.epf.diagramming.edit.parts;
-
-import java.util.Iterator;
-
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.StackLayout;
-import org.eclipse.epf.diagramming.edit.policies.ActivityFinalNodeCanonicalEditPolicy;
-import org.eclipse.epf.diagramming.edit.policies.ActivityFinalNodeGraphicalNodeEditPolicy;
-import org.eclipse.epf.diagramming.edit.policies.ActivityFinalNodeItemSemanticEditPolicy;
-import org.eclipse.epf.diagramming.edit.policies.UMLExtNodeLabelHostLayoutEditPolicy;
-import org.eclipse.epf.diagramming.part.UMLVisualIDRegistry;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.GraphicalEditPart;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.editparts.LayerManager;
-import org.eclipse.gef.editpolicies.LayoutEditPolicy;
-import org.eclipse.gef.editpolicies.NonResizableEditPolicy;
-import org.eclipse.gef.requests.CreateRequest;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.ShapeNodeEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
-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;
-
-/**
- * @generated
- */
-public class ActivityFinalNodeEditPart extends ShapeNodeEditPart {
-
-	/**
-	 * @generated
-	 */
-	public static final int VISUAL_ID = 1001;
-
-	/**
-	 * @generated
-	 */
-	protected IFigure contentPane;
-
-	/**
-	 * @generated
-	 */
-	protected IFigure primaryShape;
-
-	/**
-	 * @generated
-	 */
-	public ActivityFinalNodeEditPart(View view) {
-		super(view);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE,
-				new ActivityFinalNodeItemSemanticEditPolicy());
-		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE,
-				new ActivityFinalNodeGraphicalNodeEditPolicy());
-		installEditPolicy(EditPolicyRoles.CANONICAL_ROLE,
-				new ActivityFinalNodeCanonicalEditPolicy());
-		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected LayoutEditPolicy createLayoutEditPolicy() {
-		LayoutEditPolicy lep = new LayoutEditPolicy() {
-
-			protected void decorateChild(EditPart child) {
-				if (isExternalLabel(child)) {
-					return;
-				}
-				super.decorateChild(child);
-			}
-
-			protected EditPolicy createChildEditPolicy(EditPart child) {
-				EditPolicy result = child
-						.getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-				if (result == null) {
-					result = new NonResizableEditPolicy();
-				}
-				return result;
-			}
-
-			protected Command getMoveChildrenCommand(Request request) {
-				return null;
-			}
-
-			protected Command getCreateCommand(CreateRequest request) {
-				return null;
-			}
-		};
-		UMLExtNodeLabelHostLayoutEditPolicy xlep = new UMLExtNodeLabelHostLayoutEditPolicy() {
-
-			protected boolean isExternalLabel(EditPart editPart) {
-				return ActivityFinalNodeEditPart.this.isExternalLabel(editPart);
-			}
-		};
-		xlep.setRealLayoutEditPolicy(lep);
-		return xlep;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected IFigure createNodeShape() {
-		EndNodeFigure figure = new EndNodeFigure();
-		return primaryShape = figure;
-	}
-
-	/**
-	 * @generated
-	 */
-	public EndNodeFigure getPrimaryShape() {
-		return (EndNodeFigure) primaryShape;
-	}
-
-	/**
-	 * @modified
-	 */
-	protected NodeFigure createNodePlate() {
-		return new DefaultSizeNodeFigure(getMapMode().DPtoLP(24), getMapMode()
-				.DPtoLP(24));
-	}
-
-	/**
-	 * 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
-	 */
-	protected NodeFigure createNodeFigure() {
-		NodeFigure figure = createNodePlate();
-		figure.setLayoutManager(new StackLayout());
-		IFigure shape = createNodeShape();
-		figure.add(shape);
-		contentPane = setupContentPane(shape);
-		return figure;
-	}
-
-	/**
-	 * Default implementation treats passed figure as content pane.
-	 * Respects layout one may have set for generated figure.
-	 * @param nodeShape instance of generated figure class
-	 * @generated
-	 */
-	protected IFigure setupContentPane(IFigure nodeShape) {
-		if (nodeShape.getLayoutManager() == null) {
-			ConstrainedToolbarLayout layout = new ConstrainedToolbarLayout();
-			layout.setSpacing(getMapMode().DPtoLP(5));
-			nodeShape.setLayoutManager(layout);
-		}
-		return nodeShape; // use nodeShape itself as contentPane
-	}
-
-	/**
-	 * @generated
-	 */
-	public IFigure getContentPane() {
-		if (contentPane != null) {
-			return contentPane;
-		}
-		return super.getContentPane();
-	}
-
-	/**
-	 * @generated
-	 */
-	public EditPart getPrimaryChildEditPart() {
-		return getChildBySemanticHint(UMLVisualIDRegistry
-				.getType(ActivityFinalNodeNameEditPart.VISUAL_ID));
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean isExternalLabel(EditPart childEditPart) {
-		if (childEditPart instanceof ActivityFinalNodeNameEditPart) {
-			return true;
-		}
-		return false;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected IFigure getExternalLabelsContainer() {
-		LayerManager root = (LayerManager) getRoot();
-		return root.getLayer(UMLEditPartFactory.EXTERNAL_NODE_LABELS_LAYER);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void addChildVisual(EditPart childEditPart, int index) {
-		if (isExternalLabel(childEditPart)) {
-			IFigure labelFigure = ((GraphicalEditPart) childEditPart)
-					.getFigure();
-			getExternalLabelsContainer().add(labelFigure);
-			return;
-		}
-		super.addChildVisual(childEditPart, -1);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void removeChildVisual(EditPart childEditPart) {
-		if (isExternalLabel(childEditPart)) {
-			IFigure labelFigure = ((GraphicalEditPart) childEditPart)
-					.getFigure();
-			getExternalLabelsContainer().remove(labelFigure);
-			return;
-		}
-		super.removeChildVisual(childEditPart);
-	}
-
-	/**
-	 * @generated
-	 */
-	public void removeNotify() {
-		for (Iterator it = getChildren().iterator(); it.hasNext();) {
-			EditPart childEditPart = (EditPart) it.next();
-			if (isExternalLabel(childEditPart)) {
-				IFigure labelFigure = ((GraphicalEditPart) childEditPart)
-						.getFigure();
-				getExternalLabelsContainer().remove(labelFigure);
-			}
-		}
-		super.removeNotify();
-	}
-
-	/**
-	 * @modified
-	 */
-	public class EndNodeFigure extends
-			org.eclipse.epf.diagramming.base.figures.EndNodeFigure {
-
-		/**
-		 * @generated
-		 */
-		public EndNodeFigure() {
-
-			this.setForegroundColor(org.eclipse.draw2d.ColorConstants.darkBlue
-
-			);
-			this.setBackgroundColor(ENDNODEFIGURE_BACK
-
-			);
-			this.setPreferredSize(getMapMode().DPtoLP(24), getMapMode().DPtoLP(
-					24));
-			this.setSize(getMapMode().DPtoLP(24), getMapMode().DPtoLP(24));
-
-			createContents();
-		}
-
-		/**
-		 * @generated
-		 */
-		private void createContents() {
-		}
-
-		/**
-		 * @generated
-		 */
-		private boolean myUseLocalCoordinates = false;
-
-		/**
-		 * @generated
-		 */
-		protected boolean useLocalCoordinates() {
-			return myUseLocalCoordinates;
-		}
-
-		/**
-		 * @generated
-		 */
-		protected void setUseLocalCoordinates(boolean useLocalCoordinates) {
-			myUseLocalCoordinates = useLocalCoordinates;
-		}
-
-	}
-
-	/**
-	 * @generated
-	 */
-	public static final org.eclipse.swt.graphics.Color ENDNODEFIGURE_BACK = new org.eclipse.swt.graphics.Color(
-			null, 45, 85, 130);
-
-}
diff --git a/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/edit/parts/ActivityFinalNodeNameEditPart.java b/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/edit/parts/ActivityFinalNodeNameEditPart.java
deleted file mode 100644
index c468047..0000000
--- a/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/edit/parts/ActivityFinalNodeNameEditPart.java
+++ /dev/null
@@ -1,588 +0,0 @@
-//------------------------------------------------------------------------------
-// Copyright (c) 2005, 2007 IBM Corporation 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:
-// IBM Corporation - initial implementation
-//------------------------------------------------------------------------------
-/*
- * Copyright (c) 2005, 2006 IBM Corporation 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:
- * IBM Corporation - initial implementation
- *
- */
-package org.eclipse.epf.diagramming.edit.parts;
-
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.Label;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.transaction.RunnableWithResult;
-import org.eclipse.epf.diagramming.edit.policies.UMLTextSelectionEditPolicy;
-import org.eclipse.epf.diagramming.part.EPFDiagramEditorPlugin;
-import org.eclipse.epf.diagramming.part.UMLVisualIDRegistry;
-import org.eclipse.epf.diagramming.providers.UMLElementTypes;
-import org.eclipse.gef.AccessibleEditPart;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.requests.DirectEditRequest;
-import org.eclipse.gef.tools.DirectEditManager;
-import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;
-import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;
-import org.eclipse.gmf.runtime.common.ui.services.parser.ParserEditStatus;
-import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;
-import org.eclipse.gmf.runtime.common.ui.services.parser.ParserService;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;
-import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;
-import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;
-import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.WrapLabel;
-import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;
-import org.eclipse.gmf.runtime.emf.ui.services.parser.ParserHintAdapter;
-import org.eclipse.gmf.runtime.notation.FontStyle;
-import org.eclipse.gmf.runtime.notation.NotationPackage;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.jface.text.contentassist.IContentAssistProcessor;
-import org.eclipse.jface.viewers.ICellEditorValidator;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.accessibility.AccessibleEvent;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.graphics.FontData;
-import org.eclipse.swt.graphics.Image;
-
-/**
- * @generated
- */
-public class ActivityFinalNodeNameEditPart extends UMLExtNodeLabelEditPart
-		implements ITextAwareEditPart {
-
-	/**
-	 * @generated
-	 */
-	public static final int VISUAL_ID = 4001;
-
-	/**
-	 * @generated
-	 */
-	private DirectEditManager manager;
-
-	/**
-	 * @generated
-	 */
-	private IParser parser;
-
-	/**
-	 * @generated
-	 */
-	private List parserElements;
-
-	/**
-	 * @generated
-	 */
-	private String defaultText;
-
-	/**
-	 * @generated
-	 */
-	static {
-		registerSnapBackPosition(UMLVisualIDRegistry
-				.getType(ActivityFinalNodeNameEditPart.VISUAL_ID), new Point(0,
-				0));
-	}
-
-	/**
-	 * @generated
-	 */
-	public ActivityFinalNodeNameEditPart(View view) {
-		super(view);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE,
-				new LabelDirectEditPolicy());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected String getLabelTextHelper(IFigure figure) {
-		if (figure instanceof WrapLabel) {
-			return ((WrapLabel) figure).getText();
-		} else {
-			return ((Label) figure).getText();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLabelTextHelper(IFigure figure, String text) {
-		if (figure instanceof WrapLabel) {
-			((WrapLabel) figure).setText(text);
-		} else {
-			((Label) figure).setText(text);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Image getLabelIconHelper(IFigure figure) {
-		if (figure instanceof WrapLabel) {
-			return ((WrapLabel) figure).getIcon();
-		} else {
-			return ((Label) figure).getIcon();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLabelIconHelper(IFigure figure, Image icon) {
-		if (figure instanceof WrapLabel) {
-			((WrapLabel) figure).setIcon(icon);
-		} else {
-			((Label) figure).setIcon(icon);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setLabel(IFigure figure) {
-		unregisterVisuals();
-		setFigure(figure);
-		defaultText = getLabelTextHelper(figure);
-		registerVisuals();
-		refreshVisuals();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected List getModelChildren() {
-		return Collections.EMPTY_LIST;
-	}
-
-	/**
-	 * @generated
-	 */
-	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected EObject getParserElement() {
-		EObject element = resolveSemanticElement();
-		return element != null ? element : (View) getModel();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Image getLabelIcon() {
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected String getLabelText() {
-		String text = null;
-		if (getParser() != null) {
-			text = getParser().getPrintString(
-					new EObjectAdapter(getParserElement()),
-					getParserOptions().intValue());
-		}
-		if (text == null || text.length() == 0) {
-			text = defaultText;
-		}
-		return text;
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setLabelText(String text) {
-		setLabelTextHelper(getFigure(), text);
-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public String getEditText() {
-		if (getParser() == null) {
-			return ""; //$NON-NLS-1$
-		}
-		return getParser().getEditString(
-				new EObjectAdapter(getParserElement()),
-				getParserOptions().intValue());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean isEditable() {
-		return getEditText() != null;
-	}
-
-	/**
-	 * @generated
-	 */
-	public ICellEditorValidator getEditTextValidator() {
-		return new ICellEditorValidator() {
-
-			public String isValid(final Object value) {
-				if (value instanceof String) {
-					final EObject element = getParserElement();
-					final IParser parser = getParser();
-					try {
-						IParserEditStatus valid = (IParserEditStatus) getEditingDomain()
-								.runExclusive(new RunnableWithResult.Impl() {
-
-									public void run() {
-										setResult(parser.isValidEditString(
-												new EObjectAdapter(element),
-												(String) value));
-									}
-								});
-						return valid.getCode() == ParserEditStatus.EDITABLE ? null
-								: valid.getMessage();
-					} catch (InterruptedException ie) {
-						ie.printStackTrace();
-					}
-				}
-
-				// shouldn't get here
-				return null;
-			}
-		};
-	}
-
-	/**
-	 * @generated
-	 */
-	public IContentAssistProcessor getCompletionProcessor() {
-		if (getParser() == null) {
-			return null;
-		}
-		return getParser().getCompletionProcessor(
-				new EObjectAdapter(getParserElement()));
-	}
-
-	/**
-	 * @generated
-	 */
-	public ParserOptions getParserOptions() {
-		return ParserOptions.NONE;
-	}
-
-	/**
-	 * @generated
-	 */
-	public IParser getParser() {
-		if (parser == null) {
-			String parserHint = ((View) getModel()).getType();
-			ParserHintAdapter hintAdapter = new ParserHintAdapter(
-					getParserElement(), parserHint) {
-
-				public Object getAdapter(Class adapter) {
-					if (IElementType.class.equals(adapter)) {
-						return UMLElementTypes.ActivityFinalNode_1001;
-					}
-					return super.getAdapter(adapter);
-				}
-			};
-			parser = ParserService.getInstance().getParser(hintAdapter);
-		}
-		return parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected DirectEditManager getManager() {
-		if (manager == null) {
-			setManager(new TextDirectEditManager(this, TextDirectEditManager
-					.getTextCellEditorClass(this), UMLEditPartFactory
-					.getTextCellEditorLocator(this)));
-		}
-		return manager;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setManager(DirectEditManager manager) {
-		this.manager = manager;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEdit() {
-		getManager().show();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEdit(Point eventLocation) {
-		if (getManager().getClass() == TextDirectEditManager.class) {
-			((TextDirectEditManager) getManager()).show(eventLocation
-					.getSWTPoint());
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	private void performDirectEdit(char initialCharacter) {
-		if (getManager() instanceof TextDirectEditManager) {
-			((TextDirectEditManager) getManager()).show(initialCharacter);
-		} else {
-			performDirectEdit();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEditRequest(Request request) {
-		final Request theRequest = request;
-		try {
-			getEditingDomain().runExclusive(new Runnable() {
-
-				public void run() {
-					if (isActive() && isEditable()) {
-						if (theRequest
-								.getExtendedData()
-								.get(
-										RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
-							Character initialChar = (Character) theRequest
-									.getExtendedData()
-									.get(
-											RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
-							performDirectEdit(initialChar.charValue());
-						} else if ((theRequest instanceof DirectEditRequest)
-								&& (getEditText().equals(getLabelText()))) {
-							DirectEditRequest editRequest = (DirectEditRequest) theRequest;
-							performDirectEdit(editRequest.getLocation());
-						} else {
-							performDirectEdit();
-						}
-					}
-				}
-			});
-		} catch (InterruptedException e) {
-			e.printStackTrace();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshVisuals() {
-		super.refreshVisuals();
-		refreshLabel();
-		refreshFont();
-		refreshFontColor();
-		refreshUnderline();
-		refreshStrikeThrough();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshLabel() {
-		setLabelTextHelper(getFigure(), getLabelText());
-		setLabelIconHelper(getFigure(), getLabelIcon());
-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshUnderline() {
-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(
-				NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null && getFigure() instanceof WrapLabel) {
-			((WrapLabel) getFigure()).setTextUnderline(style.isUnderline());
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshStrikeThrough() {
-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(
-				NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null && getFigure() instanceof WrapLabel) {
-			((WrapLabel) getFigure()).setTextStrikeThrough(style
-					.isStrikeThrough());
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshFont() {
-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(
-				NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null) {
-			FontData fontData = new FontData(style.getFontName(), style
-					.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL)
-					| (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));
-			setFont(fontData);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setFontColor(Color color) {
-		getFigure().setForegroundColor(color);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void addSemanticListeners() {
-		if (getParser() instanceof ISemanticParser) {
-			EObject element = resolveSemanticElement();
-			parserElements = ((ISemanticParser) getParser())
-					.getSemanticElementsBeingParsed(element);
-			for (int i = 0; i < parserElements.size(); i++) {
-				addListenerFilter(
-						"SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$
-			}
-		} else {
-			super.addSemanticListeners();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void removeSemanticListeners() {
-		if (parserElements != null) {
-			for (int i = 0; i < parserElements.size(); i++) {
-				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$
-			}
-		} else {
-			super.removeSemanticListeners();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected AccessibleEditPart getAccessibleEditPart() {
-		if (accessibleEP == null) {
-			accessibleEP = new AccessibleGraphicalEditPart() {
-
-				public void getName(AccessibleEvent e) {
-					e.result = getLabelTextHelper(getFigure());
-				}
-			};
-		}
-		return accessibleEP;
-	}
-
-	/**
-	 * @generated
-	 */
-	private View getFontStyleOwnerView() {
-		return getPrimaryView();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void handleNotificationEvent(Notification event) {
-		Object feature = event.getFeature();
-		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {
-			Integer c = (Integer) event.getNewValue();
-			setFontColor(DiagramColorRegistry.getInstance().getColor(c));
-		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(
-				feature)) {
-			refreshUnderline();
-		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough()
-				.equals(feature)) {
-			refreshStrikeThrough();
-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(
-				feature)
-				|| NotationPackage.eINSTANCE.getFontStyle_FontName().equals(
-						feature)
-				|| NotationPackage.eINSTANCE.getFontStyle_Bold()
-						.equals(feature)
-				|| NotationPackage.eINSTANCE.getFontStyle_Italic().equals(
-						feature)) {
-			refreshFont();
-		} else {
-			if (getParser() != null
-					&& getParser().isAffectingEvent(event,
-							getParserOptions().intValue())) {
-				refreshLabel();
-			}
-			if (getParser() instanceof ISemanticParser) {
-				ISemanticParser modelParser = (ISemanticParser) getParser();
-				if (modelParser.areSemanticElementsAffected(null, event)) {
-					removeSemanticListeners();
-					if (resolveSemanticElement() != null) {
-						addSemanticListeners();
-					}
-					refreshLabel();
-				}
-			}
-		}
-		super.handleNotificationEvent(event);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected IFigure createFigure() {
-		IFigure label = createFigurePrim();
-		defaultText = getLabelTextHelper(label);
-		return label;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected IFigure createFigurePrim() {
-		return new WrapLabel();
-	}
-
-}
diff --git a/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/edit/parts/ActivityParameterNode2EditPart.java b/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/edit/parts/ActivityParameterNode2EditPart.java
deleted file mode 100644
index c7faa67..0000000
--- a/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/edit/parts/ActivityParameterNode2EditPart.java
+++ /dev/null
@@ -1,295 +0,0 @@
-//------------------------------------------------------------------------------
-// Copyright (c) 2005, 2007 IBM Corporation 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:
-// IBM Corporation - initial implementation
-//------------------------------------------------------------------------------
-/*
- * Copyright (c) 2005, 2006 IBM Corporation 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:
- * IBM Corporation - initial implementation
- *
- */
-package org.eclipse.epf.diagramming.edit.parts;
-
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.StackLayout;
-import org.eclipse.epf.diagram.core.util.DiagramCoreUtil;
-import org.eclipse.epf.diagramming.edit.policies.ActivityParameterNode2CanonicalEditPolicy;
-import org.eclipse.epf.diagramming.edit.policies.ActivityParameterNode2GraphicalNodeEditPolicy;
-import org.eclipse.epf.diagramming.edit.policies.ActivityParameterNode2ItemSemanticEditPolicy;
-import org.eclipse.epf.diagramming.part.UMLVisualIDRegistry;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.editpolicies.LayoutEditPolicy;
-import org.eclipse.gef.editpolicies.NonResizableEditPolicy;
-import org.eclipse.gef.requests.CreateRequest;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.ShapeNodeEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
-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;
-
-/**
- * @generated
- */
-public class ActivityParameterNode2EditPart extends ShapeNodeEditPart {
-
-	/**
-	 * @generated
-	 */
-	public static final int VISUAL_ID = 1012;
-
-	/**
-	 * @generated
-	 */
-	protected IFigure contentPane;
-
-	/**
-	 * @generated
-	 */
-	protected IFigure primaryShape;
-
-	/**
-	 * @generated
-	 */
-	public ActivityParameterNode2EditPart(View view) {
-		super(view);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE,
-				new ActivityParameterNode2ItemSemanticEditPolicy());
-		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE,
-				new ActivityParameterNode2GraphicalNodeEditPolicy());
-		installEditPolicy(EditPolicyRoles.CANONICAL_ROLE,
-				new ActivityParameterNode2CanonicalEditPolicy());
-		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected LayoutEditPolicy createLayoutEditPolicy() {
-		LayoutEditPolicy lep = new LayoutEditPolicy() {
-
-			protected EditPolicy createChildEditPolicy(EditPart child) {
-				EditPolicy result = child
-						.getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-				if (result == null) {
-					result = new NonResizableEditPolicy();
-				}
-				return result;
-			}
-
-			protected Command getMoveChildrenCommand(Request request) {
-				return null;
-			}
-
-			protected Command getCreateCommand(CreateRequest request) {
-				return null;
-			}
-		};
-		return lep;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected IFigure createNodeShape() {
-		ActivityParameterNodeFigure figure = new ActivityParameterNodeFigure();
-		return primaryShape = figure;
-	}
-
-	/**
-	 * @generated
-	 */
-	public ActivityParameterNodeFigure getPrimaryShape() {
-		return (ActivityParameterNodeFigure) primaryShape;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean addFixedChild(EditPart childEditPart) {
-		if (childEditPart instanceof ActivityParameterNodeName2EditPart) {
-			((ActivityParameterNodeName2EditPart) childEditPart)
-					.setLabel(getPrimaryShape()
-							.getFigureActivityParameterNodeNameLabel());
-			return true;
-		}
-		return false;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean removeFixedChild(EditPart childEditPart) {
-		return false;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected NodeFigure createNodePlate() {
-		return new DefaultSizeNodeFigure(getMapMode().DPtoLP(40), getMapMode()
-				.DPtoLP(40));
-	}
-
-	/**
-	 * 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
-	 */
-	protected NodeFigure createNodeFigure() {
-		NodeFigure figure = createNodePlate();
-		figure.setLayoutManager(new StackLayout());
-		IFigure shape = createNodeShape();
-		figure.add(shape);
-		contentPane = setupContentPane(shape);
-		return figure;
-	}
-
-	/**
-	 * Default implementation treats passed figure as content pane.
-	 * Respects layout one may have set for generated figure.
-	 * @param nodeShape instance of generated figure class
-	 * @generated
-	 */
-	protected IFigure setupContentPane(IFigure nodeShape) {
-		if (nodeShape.getLayoutManager() == null) {
-			ConstrainedToolbarLayout layout = new ConstrainedToolbarLayout();
-			layout.setSpacing(getMapMode().DPtoLP(5));
-			nodeShape.setLayoutManager(layout);
-		}
-		return nodeShape; // use nodeShape itself as contentPane
-	}
-
-	/**
-	 * @generated
-	 */
-	public IFigure getContentPane() {
-		if (contentPane != null) {
-			return contentPane;
-		}
-		return super.getContentPane();
-	}
-
-	/**
-	 * @generated
-	 */
-	public EditPart getPrimaryChildEditPart() {
-		return getChildBySemanticHint(UMLVisualIDRegistry
-				.getType(ActivityParameterNodeName2EditPart.VISUAL_ID));
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void addChildVisual(EditPart childEditPart, int index) {
-		if (addFixedChild(childEditPart)) {
-			return;
-		}
-		super.addChildVisual(childEditPart, -1);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void removeChildVisual(EditPart childEditPart) {
-		if (removeFixedChild(childEditPart)) {
-			return;
-		}
-		super.removeChildVisual(childEditPart);
-	}
-
-	/**
-	 * @generated
-	 */
-	public class ActivityParameterNodeFigure extends
-			org.eclipse.draw2d.RectangleFigure {
-
-		/**
-		 * @generated
-		 */
-		public ActivityParameterNodeFigure() {
-
-			this.setOutline(false);
-			createContents();
-		}
-
-		/**
-		 * @modified
-		 */
-		private void createContents() {
-			org.eclipse.gmf.runtime.draw2d.ui.figures.WrapLabel fig_0 = new org.eclipse.gmf.runtime.draw2d.ui.figures.WrapLabel();
-
-			DiagramCoreUtil.setLabelProperties(fig_0);
-			setFigureActivityParameterNodeNameLabel(fig_0);
-
-			Object layData0 = null;
-
-			this.add(fig_0, layData0);
-		}
-
-		/**
-		 * @generated
-		 */
-		private org.eclipse.gmf.runtime.draw2d.ui.figures.WrapLabel fActivityParameterNodeNameLabel;
-
-		/**
-		 * @generated
-		 */
-		public org.eclipse.gmf.runtime.draw2d.ui.figures.WrapLabel getFigureActivityParameterNodeNameLabel() {
-			return fActivityParameterNodeNameLabel;
-		}
-
-		/**
-		 * @generated
-		 */
-		private void setFigureActivityParameterNodeNameLabel(
-				org.eclipse.gmf.runtime.draw2d.ui.figures.WrapLabel fig) {
-			fActivityParameterNodeNameLabel = fig;
-		}
-
-		/**
-		 * @generated
-		 */
-		private boolean myUseLocalCoordinates = false;
-
-		/**
-		 * @generated
-		 */
-		protected boolean useLocalCoordinates() {
-			return myUseLocalCoordinates;
-		}
-
-		/**
-		 * @generated
-		 */
-		protected void setUseLocalCoordinates(boolean useLocalCoordinates) {
-			myUseLocalCoordinates = useLocalCoordinates;
-		}
-
-	}
-
-}
diff --git a/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/edit/parts/ActivityParameterNodeEditPart.java b/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/edit/parts/ActivityParameterNodeEditPart.java
deleted file mode 100644
index 164bbde..0000000
--- a/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/edit/parts/ActivityParameterNodeEditPart.java
+++ /dev/null
@@ -1,295 +0,0 @@
-//------------------------------------------------------------------------------
-// Copyright (c) 2005, 2007 IBM Corporation 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:
-// IBM Corporation - initial implementation
-//------------------------------------------------------------------------------
-/*
- * Copyright (c) 2005, 2006 IBM Corporation 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:
- * IBM Corporation - initial implementation
- *
- */
-package org.eclipse.epf.diagramming.edit.parts;
-
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.StackLayout;
-import org.eclipse.epf.diagram.core.util.DiagramCoreUtil;
-import org.eclipse.epf.diagramming.edit.policies.ActivityParameterNodeCanonicalEditPolicy;
-import org.eclipse.epf.diagramming.edit.policies.ActivityParameterNodeGraphicalNodeEditPolicy;
-import org.eclipse.epf.diagramming.edit.policies.ActivityParameterNodeItemSemanticEditPolicy;
-import org.eclipse.epf.diagramming.part.UMLVisualIDRegistry;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.editpolicies.LayoutEditPolicy;
-import org.eclipse.gef.editpolicies.NonResizableEditPolicy;
-import org.eclipse.gef.requests.CreateRequest;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.ShapeNodeEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
-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;
-
-/**
- * @generated
- */
-public class ActivityParameterNodeEditPart extends ShapeNodeEditPart {
-
-	/**
-	 * @generated
-	 */
-	public static final int VISUAL_ID = 1009;
-
-	/**
-	 * @generated
-	 */
-	protected IFigure contentPane;
-
-	/**
-	 * @generated
-	 */
-	protected IFigure primaryShape;
-
-	/**
-	 * @generated
-	 */
-	public ActivityParameterNodeEditPart(View view) {
-		super(view);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE,
-				new ActivityParameterNodeItemSemanticEditPolicy());
-		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE,
-				new ActivityParameterNodeGraphicalNodeEditPolicy());
-		installEditPolicy(EditPolicyRoles.CANONICAL_ROLE,
-				new ActivityParameterNodeCanonicalEditPolicy());
-		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected LayoutEditPolicy createLayoutEditPolicy() {
-		LayoutEditPolicy lep = new LayoutEditPolicy() {
-
-			protected EditPolicy createChildEditPolicy(EditPart child) {
-				EditPolicy result = child
-						.getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-				if (result == null) {
-					result = new NonResizableEditPolicy();
-				}
-				return result;
-			}
-
-			protected Command getMoveChildrenCommand(Request request) {
-				return null;
-			}
-
-			protected Command getCreateCommand(CreateRequest request) {
-				return null;
-			}
-		};
-		return lep;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected IFigure createNodeShape() {
-		ActivityParameterNodeFigure figure = new ActivityParameterNodeFigure();
-		return primaryShape = figure;
-	}
-
-	/**
-	 * @generated
-	 */
-	public ActivityParameterNodeFigure getPrimaryShape() {
-		return (ActivityParameterNodeFigure) primaryShape;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean addFixedChild(EditPart childEditPart) {
-		if (childEditPart instanceof ActivityParameterNodeNameEditPart) {
-			((ActivityParameterNodeNameEditPart) childEditPart)
-					.setLabel(getPrimaryShape()
-							.getFigureActivityParameterNodeNameLabel());
-			return true;
-		}
-		return false;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean removeFixedChild(EditPart childEditPart) {
-		return false;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected NodeFigure createNodePlate() {
-		return new DefaultSizeNodeFigure(getMapMode().DPtoLP(40), getMapMode()
-				.DPtoLP(40));
-	}
-
-	/**
-	 * 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
-	 */
-	protected NodeFigure createNodeFigure() {
-		NodeFigure figure = createNodePlate();
-		figure.setLayoutManager(new StackLayout());
-		IFigure shape = createNodeShape();
-		figure.add(shape);
-		contentPane = setupContentPane(shape);
-		return figure;
-	}
-
-	/**
-	 * Default implementation treats passed figure as content pane.
-	 * Respects layout one may have set for generated figure.
-	 * @param nodeShape instance of generated figure class
-	 * @generated
-	 */
-	protected IFigure setupContentPane(IFigure nodeShape) {
-		if (nodeShape.getLayoutManager() == null) {
-			ConstrainedToolbarLayout layout = new ConstrainedToolbarLayout();
-			layout.setSpacing(getMapMode().DPtoLP(5));
-			nodeShape.setLayoutManager(layout);
-		}
-		return nodeShape; // use nodeShape itself as contentPane
-	}
-
-	/**
-	 * @generated
-	 */
-	public IFigure getContentPane() {
-		if (contentPane != null) {
-			return contentPane;
-		}
-		return super.getContentPane();
-	}
-
-	/**
-	 * @generated
-	 */
-	public EditPart getPrimaryChildEditPart() {
-		return getChildBySemanticHint(UMLVisualIDRegistry
-				.getType(ActivityParameterNodeNameEditPart.VISUAL_ID));
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void addChildVisual(EditPart childEditPart, int index) {
-		if (addFixedChild(childEditPart)) {
-			return;
-		}
-		super.addChildVisual(childEditPart, -1);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void removeChildVisual(EditPart childEditPart) {
-		if (removeFixedChild(childEditPart)) {
-			return;
-		}
-		super.removeChildVisual(childEditPart);
-	}
-
-	/**
-	 * @generated
-	 */
-	public class ActivityParameterNodeFigure extends
-			org.eclipse.draw2d.RectangleFigure {
-
-		/**
-		 * @generated
-		 */
-		public ActivityParameterNodeFigure() {
-
-			this.setOutline(false);
-			createContents();
-		}
-
-		/**
-		 * @modified
-		 */
-		private void createContents() {
-			org.eclipse.gmf.runtime.draw2d.ui.figures.WrapLabel fig_0 = new org.eclipse.gmf.runtime.draw2d.ui.figures.WrapLabel();
-
-			DiagramCoreUtil.setLabelProperties(fig_0);
-			setFigureActivityParameterNodeNameLabel(fig_0);
-
-			Object layData0 = null;
-
-			this.add(fig_0, layData0);
-		}
-
-		/**
-		 * @generated
-		 */
-		private org.eclipse.gmf.runtime.draw2d.ui.figures.WrapLabel fActivityParameterNodeNameLabel;
-
-		/**
-		 * @generated
-		 */
-		public org.eclipse.gmf.runtime.draw2d.ui.figures.WrapLabel getFigureActivityParameterNodeNameLabel() {
-			return fActivityParameterNodeNameLabel;
-		}
-
-		/**
-		 * @generated
-		 */
-		private void setFigureActivityParameterNodeNameLabel(
-				org.eclipse.gmf.runtime.draw2d.ui.figures.WrapLabel fig) {
-			fActivityParameterNodeNameLabel = fig;
-		}
-
-		/**
-		 * @generated
-		 */
-		private boolean myUseLocalCoordinates = false;
-
-		/**
-		 * @generated
-		 */
-		protected boolean useLocalCoordinates() {
-			return myUseLocalCoordinates;
-		}
-
-		/**
-		 * @generated
-		 */
-		protected void setUseLocalCoordinates(boolean useLocalCoordinates) {
-			myUseLocalCoordinates = useLocalCoordinates;
-		}
-
-	}
-
-}
diff --git a/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/edit/parts/ActivityParameterNodeName2EditPart.java b/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/edit/parts/ActivityParameterNodeName2EditPart.java
deleted file mode 100644
index e74d95a..0000000
--- a/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/edit/parts/ActivityParameterNodeName2EditPart.java
+++ /dev/null
@@ -1,656 +0,0 @@
-//------------------------------------------------------------------------------
-// Copyright (c) 2005, 2007 IBM Corporation 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:
-// IBM Corporation - initial implementation
-//------------------------------------------------------------------------------
-/*
- * Copyright (c) 2005, 2006 IBM Corporation 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:
- * IBM Corporation - initial implementation
- *
- */
-package org.eclipse.epf.diagramming.edit.parts;
-
-import java.util.ArrayList;
-import java.util.List;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.GraphicalEditPart;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.editpolicies.NonResizableEditPolicy;
-import org.eclipse.gef.handles.NonResizableHandleKit;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;
-import org.eclipse.gmf.runtime.notation.View;
-import java.util.Collections;
-
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.Label;
-
-import org.eclipse.draw2d.geometry.Point;
-
-import org.eclipse.emf.common.notify.Notification;
-
-import org.eclipse.emf.ecore.EObject;
-
-import org.eclipse.emf.transaction.RunnableWithResult;
-
-import org.eclipse.epf.diagram.core.util.DiagramCoreUtil;
-import org.eclipse.epf.diagram.core.util.ValidatingTextDirectEditManager;
-import org.eclipse.epf.diagramming.edit.policies.UMLTextSelectionEditPolicy;
-
-import org.eclipse.epf.diagramming.part.EPFDiagramEditorPlugin;
-import org.eclipse.epf.diagramming.providers.UMLElementTypes;
-
-import org.eclipse.gef.AccessibleEditPart;
-
-import org.eclipse.gef.requests.DirectEditRequest;
-
-import org.eclipse.gef.tools.DirectEditManager;
-
-import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;
-import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;
-import org.eclipse.gmf.runtime.common.ui.services.parser.ParserEditStatus;
-import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;
-import org.eclipse.gmf.runtime.common.ui.services.parser.ParserService;
-
-import org.eclipse.gmf.runtime.diagram.ui.editparts.CompartmentEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
-
-import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;
-
-import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;
-
-import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;
-
-import org.eclipse.gmf.runtime.draw2d.ui.figures.WrapLabel;
-
-import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;
-
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-
-import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;
-import org.eclipse.gmf.runtime.emf.ui.services.parser.ParserHintAdapter;
-
-import org.eclipse.gmf.runtime.notation.FontStyle;
-import org.eclipse.gmf.runtime.notation.NotationPackage;
-
-import org.eclipse.jface.text.contentassist.IContentAssistProcessor;
-
-import org.eclipse.jface.viewers.ICellEditorValidator;
-
-import org.eclipse.swt.SWT;
-
-import org.eclipse.swt.accessibility.AccessibleEvent;
-
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.graphics.FontData;
-import org.eclipse.swt.graphics.Image;
-
-/**
- * @generated
- */
-public class ActivityParameterNodeName2EditPart extends CompartmentEditPart
-		implements ITextAwareEditPart {
-
-	/**
-	 * @generated
-	 */
-	public static final int VISUAL_ID = 4011;
-
-	/**
-	 * @generated
-	 */
-	private DirectEditManager manager;
-
-	/**
-	 * @generated
-	 */
-	private IParser parser;
-
-	/**
-	 * @generated
-	 */
-	private List parserElements;
-
-	/**
-	 * @generated
-	 */
-	private String defaultText;
-
-	/**
-	 * @generated
-	 */
-	public ActivityParameterNodeName2EditPart(View view) {
-		super(view);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE,
-				new LabelDirectEditPolicy());
-		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE,
-				new NonResizableEditPolicy() {
-
-					protected List createSelectionHandles() {
-						List handles = new ArrayList();
-						NonResizableHandleKit.addMoveHandle(
-								(GraphicalEditPart) getHost(), handles);
-						return handles;
-					}
-
-					public Command getCommand(Request request) {
-						return null;
-					}
-
-					public boolean understandsRequest(Request request) {
-						return false;
-					}
-				});
-	}
-
-	/**
-	 * @generated
-	 */
-	protected String getLabelTextHelper(IFigure figure) {
-		if (figure instanceof WrapLabel) {
-			return ((WrapLabel) figure).getText();
-		} else {
-			return ((Label) figure).getText();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLabelTextHelper(IFigure figure, String text) {
-		if (figure instanceof WrapLabel) {
-			((WrapLabel) figure).setText(text);
-		} else {
-			((Label) figure).setText(text);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Image getLabelIconHelper(IFigure figure) {
-		if (figure instanceof WrapLabel) {
-			return ((WrapLabel) figure).getIcon();
-		} else {
-			return ((Label) figure).getIcon();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLabelIconHelper(IFigure figure, Image icon) {
-		if (figure instanceof WrapLabel) {
-			((WrapLabel) figure).setIcon(icon);
-		} else {
-			((Label) figure).setIcon(icon);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setLabel(WrapLabel figure) {
-		unregisterVisuals();
-		setFigure(figure);
-		defaultText = getLabelTextHelper(figure);
-		registerVisuals();
-		refreshVisuals();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected List getModelChildren() {
-		return Collections.EMPTY_LIST;
-	}
-
-	/**
-	 * @generated
-	 */
-	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected EObject getParserElement() {
-		EObject element = resolveSemanticElement();
-		return element != null ? element : (View) getModel();
-	}
-
-	/**
-	 * @modified
-	 */
-	protected Image getLabelIcon() {
-		//return null;
-		return EPFDiagramEditorPlugin.getInstance().getImage(
-				"diagram/milestone.gif");
-	}
-
-	/**
-	 * @generated
-	 */
-	protected String getLabelText() {
-		String text = null;
-		if (getParser() != null) {
-			text = getParser().getPrintString(
-					new EObjectAdapter(getParserElement()),
-					getParserOptions().intValue());
-		}
-		if (text == null || text.length() == 0) {
-			text = defaultText;
-		}
-		return text;
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setLabelText(String text) {
-		setLabelTextHelper(getFigure(), text);
-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public String getEditText() {
-		if (getParser() == null) {
-			return ""; //$NON-NLS-1$
-		}
-		return getParser().getEditString(
-				new EObjectAdapter(getParserElement()),
-				getParserOptions().intValue());
-	}
-
-	/**
-	 * @modified
-	 */
-	protected boolean isEditable() {
-		if (DiagramCoreUtil.isReadOnly(this))
-			return false;
-		return getEditText() != null;
-	}
-
-	/**
-	 * @generated
-	 */
-	public ICellEditorValidator getEditTextValidator() {
-		return new ICellEditorValidator() {
-
-			public String isValid(final Object value) {
-				if (value instanceof String) {
-					final EObject element = getParserElement();
-					final IParser parser = getParser();
-					try {
-						IParserEditStatus valid = (IParserEditStatus) getEditingDomain()
-								.runExclusive(new RunnableWithResult.Impl() {
-
-									public void run() {
-										setResult(parser.isValidEditString(
-												new EObjectAdapter(element),
-												(String) value));
-									}
-								});
-						return valid.getCode() == ParserEditStatus.EDITABLE ? null
-								: valid.getMessage();
-					} catch (InterruptedException ie) {
-						ie.printStackTrace();
-					}
-				}
-
-				// shouldn't get here
-				return null;
-			}
-		};
-	}
-
-	/**
-	 * @generated
-	 */
-	public IContentAssistProcessor getCompletionProcessor() {
-		if (getParser() == null) {
-			return null;
-		}
-		return getParser().getCompletionProcessor(
-				new EObjectAdapter(getParserElement()));
-	}
-
-	/**
-	 * @generated
-	 */
-	public ParserOptions getParserOptions() {
-		return ParserOptions.NONE;
-	}
-
-	/**
-	 * @generated
-	 */
-	public IParser getParser() {
-		if (parser == null) {
-			String parserHint = ((View) getModel()).getType();
-			ParserHintAdapter hintAdapter = new ParserHintAdapter(
-					getParserElement(), parserHint) {
-
-				public Object getAdapter(Class adapter) {
-					if (IElementType.class.equals(adapter)) {
-						return UMLElementTypes.ActivityParameterNode_1012;
-					}
-					return super.getAdapter(adapter);
-				}
-			};
-			parser = ParserService.getInstance().getParser(hintAdapter);
-		}
-		return parser;
-	}
-
-	/**
-	 * @modified
-	 */
-	protected DirectEditManager getManager() {
-		if (manager == null) {
-			setManager(new ValidatingTextDirectEditManager(this,
-					TextDirectEditManager.getTextCellEditorClass(this),
-					UMLEditPartFactory.getTextCellEditorLocator(this)) {
-
-				@Override
-				protected void performDirectEdit() {
-					((ActivityParameterNodeName2EditPart) getEditPart())
-							.performDirectEdit();
-				}
-
-				@Override
-				protected String validate(String txt) {
-					return DiagramCoreUtil.validStringForBreakdownElements(
-							getEditPart(), txt);
-				}
-
-			});
-		}
-		return manager;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setManager(DirectEditManager manager) {
-		this.manager = manager;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEdit() {
-		getManager().show();
-	}
-
-	/**
-	 * @modified
-	 */
-	protected void performDirectEdit(Point eventLocation) {
-		if (getManager() instanceof TextDirectEditManager) {
-			((TextDirectEditManager) getManager()).show(eventLocation
-					.getSWTPoint());
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	private void performDirectEdit(char initialCharacter) {
-		if (getManager() instanceof TextDirectEditManager) {
-			((TextDirectEditManager) getManager()).show(initialCharacter);
-		} else {
-			performDirectEdit();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEditRequest(Request request) {
-		final Request theRequest = request;
-		try {
-			getEditingDomain().runExclusive(new Runnable() {
-
-				public void run() {
-					if (isActive() && isEditable()) {
-						if (theRequest
-								.getExtendedData()
-								.get(
-										RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
-							Character initialChar = (Character) theRequest
-									.getExtendedData()
-									.get(
-											RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
-							performDirectEdit(initialChar.charValue());
-						} else if ((theRequest instanceof DirectEditRequest)
-								&& (getEditText().equals(getLabelText()))) {
-							DirectEditRequest editRequest = (DirectEditRequest) theRequest;
-							performDirectEdit(editRequest.getLocation());
-						} else {
-							performDirectEdit();
-						}
-					}
-				}
-			});
-		} catch (InterruptedException e) {
-			e.printStackTrace();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshVisuals() {
-		super.refreshVisuals();
-		refreshLabel();
-		refreshFont();
-		refreshFontColor();
-		refreshUnderline();
-		refreshStrikeThrough();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshLabel() {
-		setLabelTextHelper(getFigure(), getLabelText());
-		setLabelIconHelper(getFigure(), getLabelIcon());
-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshUnderline() {
-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(
-				NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null && getFigure() instanceof WrapLabel) {
-			((WrapLabel) getFigure()).setTextUnderline(style.isUnderline());
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshStrikeThrough() {
-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(
-				NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null && getFigure() instanceof WrapLabel) {
-			((WrapLabel) getFigure()).setTextStrikeThrough(style
-					.isStrikeThrough());
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshFont() {
-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(
-				NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null) {
-			FontData fontData = new FontData(style.getFontName(), style
-					.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL)
-					| (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));
-			setFont(fontData);
-		}
-	}
-
-	/**
-	 * @modified
-	 */
-	protected void setFontColor(Color color) {
-		Color c = DiagramCoreUtil.getFontColor(this);
-		if (c != null) {
-			color = c;
-		}
-		getFigure().setForegroundColor(color);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void addSemanticListeners() {
-		if (getParser() instanceof ISemanticParser) {
-			EObject element = resolveSemanticElement();
-			parserElements = ((ISemanticParser) getParser())
-					.getSemanticElementsBeingParsed(element);
-			for (int i = 0; i < parserElements.size(); i++) {
-				addListenerFilter(
-						"SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$
-			}
-		} else {
-			super.addSemanticListeners();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void removeSemanticListeners() {
-		if (parserElements != null) {
-			for (int i = 0; i < parserElements.size(); i++) {
-				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$
-			}
-		} else {
-			super.removeSemanticListeners();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected AccessibleEditPart getAccessibleEditPart() {
-		if (accessibleEP == null) {
-			accessibleEP = new AccessibleGraphicalEditPart() {
-
-				public void getName(AccessibleEvent e) {
-					e.result = getLabelTextHelper(getFigure());
-				}
-			};
-		}
-		return accessibleEP;
-	}
-
-	/**
-	 * @generated
-	 */
-	private View getFontStyleOwnerView() {
-		return getPrimaryView();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void addNotationalListeners() {
-		super.addNotationalListeners();
-		addListenerFilter("PrimaryView", this, getPrimaryView()); //$NON-NLS-1$
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void removeNotationalListeners() {
-		super.removeNotationalListeners();
-		removeListenerFilter("PrimaryView"); //$NON-NLS-1$
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void handleNotificationEvent(Notification event) {
-		Object feature = event.getFeature();
-		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {
-			Integer c = (Integer) event.getNewValue();
-			setFontColor(DiagramColorRegistry.getInstance().getColor(c));
-		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(
-				feature)) {
-			refreshUnderline();
-		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough()
-				.equals(feature)) {
-			refreshStrikeThrough();
-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(
-				feature)
-				|| NotationPackage.eINSTANCE.getFontStyle_FontName().equals(
-						feature)
-				|| NotationPackage.eINSTANCE.getFontStyle_Bold()
-						.equals(feature)
-				|| NotationPackage.eINSTANCE.getFontStyle_Italic().equals(
-						feature)) {
-			refreshFont();
-		} else {
-			if (getParser() != null
-					&& getParser().isAffectingEvent(event,
-							getParserOptions().intValue())) {
-				refreshLabel();
-			}
-			if (getParser() instanceof ISemanticParser) {
-				ISemanticParser modelParser = (ISemanticParser) getParser();
-				if (modelParser.areSemanticElementsAffected(null, event)) {
-					removeSemanticListeners();
-					if (resolveSemanticElement() != null) {
-						addSemanticListeners();
-					}
-					refreshLabel();
-				}
-			}
-		}
-		super.handleNotificationEvent(event);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected IFigure createFigure() {
-		// Parent should assign one using setLabel method
-		return null;
-	}
-}
diff --git a/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/edit/parts/ActivityParameterNodeNameEditPart.java b/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/edit/parts/ActivityParameterNodeNameEditPart.java
deleted file mode 100644
index 4c5a820..0000000
--- a/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/edit/parts/ActivityParameterNodeNameEditPart.java
+++ /dev/null
@@ -1,632 +0,0 @@
-//------------------------------------------------------------------------------
-// Copyright (c) 2005, 2007 IBM Corporation 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:
-// IBM Corporation - initial implementation
-//------------------------------------------------------------------------------
-/*
- * Copyright (c) 2005, 2006 IBM Corporation 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:
- * IBM Corporation - initial implementation
- *
- */
-package org.eclipse.epf.diagramming.edit.parts;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.Label;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.transaction.RunnableWithResult;
-import org.eclipse.epf.diagram.core.util.DiagramCoreUtil;
-import org.eclipse.epf.diagram.core.util.ValidatingTextDirectEditManager;
-import org.eclipse.epf.diagramming.edit.policies.UMLTextSelectionEditPolicy;
-import org.eclipse.epf.diagramming.part.EPFDiagramEditorPlugin;
-import org.eclipse.epf.diagramming.providers.UMLElementTypes;
-import org.eclipse.gef.AccessibleEditPart;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.GraphicalEditPart;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.editpolicies.NonResizableEditPolicy;
-import org.eclipse.gef.handles.NonResizableHandleKit;
-import org.eclipse.gef.requests.DirectEditRequest;
-import org.eclipse.gef.tools.DirectEditManager;
-import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;
-import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;
-import org.eclipse.gmf.runtime.common.ui.services.parser.ParserEditStatus;
-import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;
-import org.eclipse.gmf.runtime.common.ui.services.parser.ParserService;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.CompartmentEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;
-import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;
-import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;
-import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.WrapLabel;
-import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;
-import org.eclipse.gmf.runtime.emf.ui.services.parser.ParserHintAdapter;
-import org.eclipse.gmf.runtime.notation.FontStyle;
-import org.eclipse.gmf.runtime.notation.NotationPackage;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.jface.text.contentassist.IContentAssistProcessor;
-import org.eclipse.jface.viewers.ICellEditorValidator;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.accessibility.AccessibleEvent;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.graphics.FontData;
-import org.eclipse.swt.graphics.Image;
-
-/**
- * @generated
- */
-public class ActivityParameterNodeNameEditPart extends CompartmentEditPart
-		implements ITextAwareEditPart {
-
-	/**
-	 * @generated
-	 */
-	public static final int VISUAL_ID = 4008;
-
-	/**
-	 * @generated
-	 */
-	private DirectEditManager manager;
-
-	/**
-	 * @generated
-	 */
-	private IParser parser;
-
-	/**
-	 * @generated
-	 */
-	private List parserElements;
-
-	/**
-	 * @generated
-	 */
-	private String defaultText;
-
-	/**
-	 * @generated
-	 */
-	public ActivityParameterNodeNameEditPart(View view) {
-		super(view);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE,
-				new LabelDirectEditPolicy());
-		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE,
-				new NonResizableEditPolicy() {
-
-					protected List createSelectionHandles() {
-						List handles = new ArrayList();
-						NonResizableHandleKit.addMoveHandle(
-								(GraphicalEditPart) getHost(), handles);
-						return handles;
-					}
-
-					public Command getCommand(Request request) {
-						return null;
-					}
-
-					public boolean understandsRequest(Request request) {
-						return false;
-					}
-				});
-	}
-
-	/**
-	 * @generated
-	 */
-	protected String getLabelTextHelper(IFigure figure) {
-		if (figure instanceof WrapLabel) {
-			return ((WrapLabel) figure).getText();
-		} else {
-			return ((Label) figure).getText();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLabelTextHelper(IFigure figure, String text) {
-		if (figure instanceof WrapLabel) {
-			((WrapLabel) figure).setText(text);
-		} else {
-			((Label) figure).setText(text);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Image getLabelIconHelper(IFigure figure) {
-		if (figure instanceof WrapLabel) {
-			return ((WrapLabel) figure).getIcon();
-		} else {
-			return ((Label) figure).getIcon();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLabelIconHelper(IFigure figure, Image icon) {
-		if (figure instanceof WrapLabel) {
-			((WrapLabel) figure).setIcon(icon);
-		} else {
-			((Label) figure).setIcon(icon);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setLabel(WrapLabel figure) {
-		unregisterVisuals();
-		setFigure(figure);
-		defaultText = getLabelTextHelper(figure);
-		registerVisuals();
-		refreshVisuals();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected List getModelChildren() {
-		return Collections.EMPTY_LIST;
-	}
-
-	/**
-	 * @generated
-	 */
-	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected EObject getParserElement() {
-		EObject element = resolveSemanticElement();
-		return element != null ? element : (View) getModel();
-	}
-
-	/**
-	 * @modified
-	 */
-	protected Image getLabelIcon() {
-		//		return null;
-		return EPFDiagramEditorPlugin.getInstance().getImage(
-				"diagram/taskdescriptor.gif");
-	}
-
-	/**
-	 * @generated
-	 */
-	protected String getLabelText() {
-		String text = null;
-		if (getParser() != null) {
-			text = getParser().getPrintString(
-					new EObjectAdapter(getParserElement()),
-					getParserOptions().intValue());
-		}
-		if (text == null || text.length() == 0) {
-			text = defaultText;
-		}
-		return text;
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setLabelText(String text) {
-		setLabelTextHelper(getFigure(), text);
-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public String getEditText() {
-		if (getParser() == null) {
-			return ""; //$NON-NLS-1$
-		}
-		return getParser().getEditString(
-				new EObjectAdapter(getParserElement()),
-				getParserOptions().intValue());
-	}
-
-	/**
-	 * @modified
-	 */
-	protected boolean isEditable() {
-		if (DiagramCoreUtil.isReadOnly(this))
-			return false;
-		return getEditText() != null;
-	}
-
-	/**
-	 * @generated
-	 */
-	public ICellEditorValidator getEditTextValidator() {
-		return new ICellEditorValidator() {
-
-			public String isValid(final Object value) {
-				if (value instanceof String) {
-					final EObject element = getParserElement();
-					final IParser parser = getParser();
-					try {
-						IParserEditStatus valid = (IParserEditStatus) getEditingDomain()
-								.runExclusive(new RunnableWithResult.Impl() {
-
-									public void run() {
-										setResult(parser.isValidEditString(
-												new EObjectAdapter(element),
-												(String) value));
-									}
-								});
-						return valid.getCode() == ParserEditStatus.EDITABLE ? null
-								: valid.getMessage();
-					} catch (InterruptedException ie) {
-						ie.printStackTrace();
-					}
-				}
-
-				// shouldn't get here
-				return null;
-			}
-		};
-	}
-
-	/**
-	 * @generated
-	 */
-	public IContentAssistProcessor getCompletionProcessor() {
-		if (getParser() == null) {
-			return null;
-		}
-		return getParser().getCompletionProcessor(
-				new EObjectAdapter(getParserElement()));
-	}
-
-	/**
-	 * @generated
-	 */
-	public ParserOptions getParserOptions() {
-		return ParserOptions.NONE;
-	}
-
-	/**
-	 * @generated
-	 */
-	public IParser getParser() {
-		if (parser == null) {
-			String parserHint = ((View) getModel()).getType();
-			ParserHintAdapter hintAdapter = new ParserHintAdapter(
-					getParserElement(), parserHint) {
-
-				public Object getAdapter(Class adapter) {
-					if (IElementType.class.equals(adapter)) {
-						return UMLElementTypes.ActivityParameterNode_1009;
-					}
-					return super.getAdapter(adapter);
-				}
-			};
-			parser = ParserService.getInstance().getParser(hintAdapter);
-		}
-		return parser;
-	}
-
-	/**
-	 * @modified
-	 */
-	protected DirectEditManager getManager() {
-		if (manager == null) {
-			setManager(new ValidatingTextDirectEditManager(this,
-					TextDirectEditManager.getTextCellEditorClass(this),
-					UMLEditPartFactory.getTextCellEditorLocator(this)) {
-
-				@Override
-				protected void performDirectEdit() {
-					((ActivityParameterNodeNameEditPart) getEditPart())
-							.performDirectEdit();
-				}
-
-				@Override
-				protected String validate(String txt) {
-					return DiagramCoreUtil.validStringForBreakdownElements(
-							getEditPart(), txt);
-				}
-
-			});
-		}
-		return manager;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setManager(DirectEditManager manager) {
-		this.manager = manager;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEdit() {
-		getManager().show();
-	}
-
-	/**
-	 * @modified
-	 */
-	protected void performDirectEdit(Point eventLocation) {
-		if (getManager() instanceof TextDirectEditManager) {
-			((TextDirectEditManager) getManager()).show(eventLocation
-					.getSWTPoint());
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	private void performDirectEdit(char initialCharacter) {
-		if (getManager() instanceof TextDirectEditManager) {
-			((TextDirectEditManager) getManager()).show(initialCharacter);
-		} else {
-			performDirectEdit();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEditRequest(Request request) {
-		final Request theRequest = request;
-		try {
-			getEditingDomain().runExclusive(new Runnable() {
-
-				public void run() {
-					if (isActive() && isEditable()) {
-						if (theRequest
-								.getExtendedData()
-								.get(
-										RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
-							Character initialChar = (Character) theRequest
-									.getExtendedData()
-									.get(
-											RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
-							performDirectEdit(initialChar.charValue());
-						} else if ((theRequest instanceof DirectEditRequest)
-								&& (getEditText().equals(getLabelText()))) {
-							DirectEditRequest editRequest = (DirectEditRequest) theRequest;
-							performDirectEdit(editRequest.getLocation());
-						} else {
-							performDirectEdit();
-						}
-					}
-				}
-			});
-		} catch (InterruptedException e) {
-			e.printStackTrace();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshVisuals() {
-		super.refreshVisuals();
-		refreshLabel();
-		refreshFont();
-		refreshFontColor();
-		refreshUnderline();
-		refreshStrikeThrough();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshLabel() {
-		setLabelTextHelper(getFigure(), getLabelText());
-		setLabelIconHelper(getFigure(), getLabelIcon());
-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshUnderline() {
-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(
-				NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null && getFigure() instanceof WrapLabel) {
-			((WrapLabel) getFigure()).setTextUnderline(style.isUnderline());
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshStrikeThrough() {
-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(
-				NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null && getFigure() instanceof WrapLabel) {
-			((WrapLabel) getFigure()).setTextStrikeThrough(style
-					.isStrikeThrough());
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshFont() {
-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(
-				NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null) {
-			FontData fontData = new FontData(style.getFontName(), style
-					.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL)
-					| (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));
-			setFont(fontData);
-		}
-	}
-
-	/**
-	 * @modified
-	 */
-	protected void setFontColor(Color color) {
-		Color c = DiagramCoreUtil.getFontColor(this);
-		if (c != null) {
-			color = c;
-		}
-		getFigure().setForegroundColor(color);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void addSemanticListeners() {
-		if (getParser() instanceof ISemanticParser) {
-			EObject element = resolveSemanticElement();
-			parserElements = ((ISemanticParser) getParser())
-					.getSemanticElementsBeingParsed(element);
-			for (int i = 0; i < parserElements.size(); i++) {
-				addListenerFilter(
-						"SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$
-			}
-		} else {
-			super.addSemanticListeners();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void removeSemanticListeners() {
-		if (parserElements != null) {
-			for (int i = 0; i < parserElements.size(); i++) {
-				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$
-			}
-		} else {
-			super.removeSemanticListeners();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected AccessibleEditPart getAccessibleEditPart() {
-		if (accessibleEP == null) {
-			accessibleEP = new AccessibleGraphicalEditPart() {
-
-				public void getName(AccessibleEvent e) {
-					e.result = getLabelTextHelper(getFigure());
-				}
-			};
-		}
-		return accessibleEP;
-	}
-
-	/**
-	 * @generated
-	 */
-	private View getFontStyleOwnerView() {
-		return getPrimaryView();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void addNotationalListeners() {
-		super.addNotationalListeners();
-		addListenerFilter("PrimaryView", this, getPrimaryView()); //$NON-NLS-1$
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void removeNotationalListeners() {
-		super.removeNotationalListeners();
-		removeListenerFilter("PrimaryView"); //$NON-NLS-1$
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void handleNotificationEvent(Notification event) {
-		Object feature = event.getFeature();
-		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {
-			Integer c = (Integer) event.getNewValue();
-			setFontColor(DiagramColorRegistry.getInstance().getColor(c));
-		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(
-				feature)) {
-			refreshUnderline();
-		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough()
-				.equals(feature)) {
-			refreshStrikeThrough();
-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(
-				feature)
-				|| NotationPackage.eINSTANCE.getFontStyle_FontName().equals(
-						feature)
-				|| NotationPackage.eINSTANCE.getFontStyle_Bold()
-						.equals(feature)
-				|| NotationPackage.eINSTANCE.getFontStyle_Italic().equals(
-						feature)) {
-			refreshFont();
-		} else {
-			if (getParser() != null
-					&& getParser().isAffectingEvent(event,
-							getParserOptions().intValue())) {
-				refreshLabel();
-			}
-			if (getParser() instanceof ISemanticParser) {
-				ISemanticParser modelParser = (ISemanticParser) getParser();
-				if (modelParser.areSemanticElementsAffected(null, event)) {
-					removeSemanticListeners();
-					if (resolveSemanticElement() != null) {
-						addSemanticListeners();
-					}
-					refreshLabel();
-				}
-			}
-		}
-		super.handleNotificationEvent(event);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected IFigure createFigure() {
-		// Parent should assign one using setLabel method
-		return null;
-	}
-}
diff --git a/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/edit/parts/ActivityPartition2EditPart.java b/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/edit/parts/ActivityPartition2EditPart.java
deleted file mode 100644
index ad71ec6..0000000
--- a/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/edit/parts/ActivityPartition2EditPart.java
+++ /dev/null
@@ -1,317 +0,0 @@
-//------------------------------------------------------------------------------
-// Copyright (c) 2005, 2007 IBM Corporation 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:
-// IBM Corporation - initial implementation
-//------------------------------------------------------------------------------
-/*
- * Copyright (c) 2005, 2006 IBM Corporation 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:
- * IBM Corporation - initial implementation
- *
- */
-package org.eclipse.epf.diagramming.edit.parts;
-
-import org.eclipse.draw2d.FreeformLayout;
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.StackLayout;
-
-import org.eclipse.draw2d.geometry.Rectangle;
-
-import org.eclipse.epf.diagramming.edit.policies.ActivityPartition2CanonicalEditPolicy;
-import org.eclipse.epf.diagramming.edit.policies.ActivityPartition2GraphicalNodeEditPolicy;
-import org.eclipse.epf.diagramming.edit.policies.ActivityPartition2ItemSemanticEditPolicy;
-
-import org.eclipse.epf.diagramming.part.UMLVisualIDRegistry;
-
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.EditPolicy;
-
-import org.eclipse.gef.editpolicies.LayoutEditPolicy;
-
-import org.eclipse.gmf.runtime.diagram.ui.editparts.ShapeNodeEditPart;
-
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.ResizableShapeEditPolicy;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.XYLayoutEditPolicy;
-
-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;
-
-/**
- * @generated
- */
-public class ActivityPartition2EditPart extends ShapeNodeEditPart {
-
-	/**
-	 * @generated
-	 */
-	public static final int VISUAL_ID = 2001;
-
-	/**
-	 * @generated
-	 */
-	protected IFigure contentPane;
-
-	/**
-	 * @generated
-	 */
-	protected IFigure primaryShape;
-
-	/**
-	 * @generated
-	 */
-	public ActivityPartition2EditPart(View view) {
-		super(view);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE,
-				new ActivityPartition2ItemSemanticEditPolicy());
-		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE,
-				new ActivityPartition2GraphicalNodeEditPolicy());
-		installEditPolicy(EditPolicyRoles.CANONICAL_ROLE,
-				new ActivityPartition2CanonicalEditPolicy());
-		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected LayoutEditPolicy createLayoutEditPolicy() {
-		XYLayoutEditPolicy lep = new XYLayoutEditPolicy() {
-
-			protected EditPolicy createChildEditPolicy(EditPart child) {
-				EditPolicy result = super.createChildEditPolicy(child);
-				if (result == null) {
-					return new ResizableShapeEditPolicy();
-				}
-				return result;
-			}
-		};
-		return lep;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected IFigure createNodeShape() {
-		ActivityPartitionFigure figure = new ActivityPartitionFigure();
-		return primaryShape = figure;
-	}
-
-	/**
-	 * @generated
-	 */
-	public ActivityPartitionFigure getPrimaryShape() {
-		return (ActivityPartitionFigure) primaryShape;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean addFixedChild(EditPart childEditPart) {
-		if (childEditPart instanceof ActivityPartitionNameEditPart) {
-			((ActivityPartitionNameEditPart) childEditPart)
-					.setLabel(getPrimaryShape().getFigurePartitionLabelFigure());
-			return true;
-		}
-		return false;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean removeFixedChild(EditPart childEditPart) {
-		return false;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected NodeFigure createNodePlate() {
-		return new DefaultSizeNodeFigure(getMapMode().DPtoLP(40), getMapMode()
-				.DPtoLP(40));
-	}
-
-	/**
-	 * 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
-	 */
-	protected NodeFigure createNodeFigure() {
-		NodeFigure figure = createNodePlate();
-		figure.setLayoutManager(new StackLayout());
-		IFigure shape = createNodeShape();
-		figure.add(shape);
-		contentPane = setupContentPane(shape);
-		return figure;
-	}
-
-	/**
-	 * Default implementation treats passed figure as content pane.
-	 * Respects layout one may have set for generated figure.
-	 * @param nodeShape instance of generated figure class
-	 * @generated
-	 */
-	protected IFigure setupContentPane(IFigure nodeShape) {
-		if (nodeShape.getLayoutManager() == null) {
-			nodeShape.setLayoutManager(new FreeformLayout() {
-
-				public Object getConstraint(IFigure figure) {
-					Object result = constraints.get(figure);
-					if (result == null) {
-						result = new Rectangle(0, 0, -1, -1);
-					}
-					return result;
-				}
-			});
-		}
-		return nodeShape; // use nodeShape itself as contentPane
-	}
-
-	/**
-	 * @generated
-	 */
-	public IFigure getContentPane() {
-		if (contentPane != null) {
-			return contentPane;
-		}
-		return super.getContentPane();
-	}
-
-	/**
-	 * @generated
-	 */
-	public EditPart getPrimaryChildEditPart() {
-		return getChildBySemanticHint(UMLVisualIDRegistry
-				.getType(ActivityPartitionNameEditPart.VISUAL_ID));
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void addChildVisual(EditPart childEditPart, int index) {
-		if (addFixedChild(childEditPart)) {
-			return;
-		}
-		super.addChildVisual(childEditPart, -1);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void removeChildVisual(EditPart childEditPart) {
-		if (removeFixedChild(childEditPart)) {
-			return;
-		}
-		super.removeChildVisual(childEditPart);
-	}
-
-	/**
-	 * @generated
-	 */
-	public class ActivityPartitionFigure extends
-			org.eclipse.draw2d.RectangleFigure {
-
-		/**
-		 * @generated
-		 */
-		public ActivityPartitionFigure() {
-
-			org.eclipse.draw2d.XYLayout myGenLayoutManager = new org.eclipse.draw2d.XYLayout();
-
-			this.setLayoutManager(myGenLayoutManager);
-
-			this.setForegroundColor(org.eclipse.draw2d.ColorConstants.black
-
-			);
-			this.setBackgroundColor(ACTIVITYPARTITIONFIGURE_BACK
-
-			);
-			this.setPreferredSize(getMapMode().DPtoLP(400), getMapMode()
-					.DPtoLP(800));
-			this.setSize(getMapMode().DPtoLP(100), getMapMode().DPtoLP(200));
-			this.setBorder(new org.eclipse.draw2d.LineBorder());
-			createContents();
-		}
-
-		/**
-		 * @generated
-		 */
-		private void createContents() {
-			org.eclipse.gmf.runtime.draw2d.ui.figures.WrapLabel fig_0 = new org.eclipse.gmf.runtime.draw2d.ui.figures.WrapLabel();
-
-			setFigurePartitionLabelFigure(fig_0);
-
-			Object layData0 = null;
-
-			this.add(fig_0, layData0);
-		}
-
-		/**
-		 * @generated
-		 */
-		private org.eclipse.gmf.runtime.draw2d.ui.figures.WrapLabel fPartitionLabelFigure;
-
-		/**
-		 * @generated
-		 */
-		public org.eclipse.gmf.runtime.draw2d.ui.figures.WrapLabel getFigurePartitionLabelFigure() {
-			return fPartitionLabelFigure;
-		}
-
-		/**
-		 * @generated
-		 */
-		private void setFigurePartitionLabelFigure(
-				org.eclipse.gmf.runtime.draw2d.ui.figures.WrapLabel fig) {
-			fPartitionLabelFigure = fig;
-		}
-
-		/**
-		 * @generated
-		 */
-		private boolean myUseLocalCoordinates = false;
-
-		/**
-		 * @generated
-		 */
-		protected boolean useLocalCoordinates() {
-			return myUseLocalCoordinates;
-		}
-
-		/**
-		 * @generated
-		 */
-		protected void setUseLocalCoordinates(boolean useLocalCoordinates) {
-			myUseLocalCoordinates = useLocalCoordinates;
-		}
-
-	}
-
-	/**
-	 * @generated
-	 */
-	public static final org.eclipse.swt.graphics.Color ACTIVITYPARTITIONFIGURE_BACK = new org.eclipse.swt.graphics.Color(
-			null, 255, 255, 255);
-
-}
diff --git a/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/edit/parts/ActivityPartitionEditPart.java b/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/edit/parts/ActivityPartitionEditPart.java
deleted file mode 100644
index ee7a487..0000000
--- a/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/edit/parts/ActivityPartitionEditPart.java
+++ /dev/null
@@ -1,366 +0,0 @@
-//------------------------------------------------------------------------------
-// Copyright (c) 2005, 2007 IBM Corporation 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:
-// IBM Corporation - initial implementation
-//------------------------------------------------------------------------------
-/*
- * Copyright (c) 2005, 2006 IBM Corporation 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:
- * IBM Corporation - initial implementation
- *
- */
-package org.eclipse.epf.diagramming.edit.parts;
-
-import org.eclipse.draw2d.FreeformLayout;
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.StackLayout;
-import org.eclipse.draw2d.geometry.Rectangle;
-
-import org.eclipse.draw2d.geometry.Dimension;
-import org.eclipse.epf.diagramming.base.policies.ActivityPartitionCreationEditPolicy;
-import org.eclipse.epf.diagramming.base.policies.ActivityPartitionDelegationEditPolicy;
-import org.eclipse.epf.diagramming.base.policies.ActivityPartitionLayoutEditPolicy;
-import org.eclipse.epf.diagramming.edit.policies.ActivityPartitionCanonicalEditPolicy;
-import org.eclipse.epf.diagramming.edit.policies.ActivityPartitionGraphicalNodeEditPolicy;
-import org.eclipse.epf.diagramming.edit.policies.ActivityPartitionItemSemanticEditPolicy;
-
-import org.eclipse.epf.diagramming.edit.policies.ActivityPartitionPartitionCampartmentItemSemanticEditPolicy;
-import org.eclipse.epf.diagramming.part.UMLVisualIDRegistry;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.editpolicies.LayoutEditPolicy;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.ShapeNodeEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.ResizableShapeEditPolicy;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.XYLayoutEditPolicy;
-import org.eclipse.gmf.runtime.diagram.ui.util.MeasurementUnitHelper;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.GravityConstrainedFlowLayout;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.GravityDirectionType;
-import org.eclipse.gmf.runtime.draw2d.ui.mapmode.IMapMode;
-import org.eclipse.gmf.runtime.gef.ui.figures.DefaultSizeNodeFigure;
-import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;
-import org.eclipse.gmf.runtime.notation.Location;
-import org.eclipse.gmf.runtime.notation.Node;
-import org.eclipse.gmf.runtime.notation.View;
-
-/**
- * @generated
- */
-public class ActivityPartitionEditPart extends ShapeNodeEditPart {
-
-	/**
-	 * @generated
-	 */
-	public static final int VISUAL_ID = 1008;
-
-	/**
-	 * @generated
-	 */
-	protected IFigure contentPane;
-
-	/**
-	 * @generated
-	 */
-	protected IFigure primaryShape;
-
-	/**
-	 * @generated
-	 */
-	public ActivityPartitionEditPart(View view) {
-		super(view);
-	}
-
-	/**
-	 * @modified
-	 */
-	protected void createDefaultEditPolicies() {
-		installEditPolicy(EditPolicyRoles.CREATION_ROLE,
-				new ActivityPartitionCreationEditPolicy());
-		super.createDefaultEditPolicies();
-		removeEditPolicy(EditPolicy.LAYOUT_ROLE);
-		installEditPolicy(
-				EditPolicyRoles.SEMANTIC_ROLE,
-				new ActivityPartitionPartitionCampartmentItemSemanticEditPolicy());
-		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE,
-				new ActivityPartitionGraphicalNodeEditPolicy());
-		installEditPolicy(EditPolicyRoles.CANONICAL_ROLE,
-				new ActivityPartitionCanonicalEditPolicy());
-		installEditPolicy(EditPolicy.LAYOUT_ROLE,
-				new ActivityPartitionLayoutEditPolicy());
-		installEditPolicy(
-				EditPolicy.CONTAINER_ROLE,
-				new ActivityPartitionDelegationEditPolicy(
-						UMLVisualIDRegistry
-								.getType(ActivityPartitionPartitionCampartmentEditPart.VISUAL_ID),
-						EditPolicy.CONTAINER_ROLE));
-
-	}
-
-	/**
-	 * @generated
-	 */
-	protected LayoutEditPolicy createLayoutEditPolicy() {
-		XYLayoutEditPolicy lep = new XYLayoutEditPolicy() {
-
-			protected EditPolicy createChildEditPolicy(EditPart child) {
-				EditPolicy result = super.createChildEditPolicy(child);
-				if (result == null) {
-					return new ResizableShapeEditPolicy();
-				}
-				return result;
-			}
-		};
-		return lep;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected IFigure createNodeShape() {
-		ActivityPartitionFigure figure = new ActivityPartitionFigure();
-		return primaryShape = figure;
-	}
-
-	/**
-	 * @generated
-	 */
-	public ActivityPartitionFigure getPrimaryShape() {
-		return (ActivityPartitionFigure) primaryShape;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean addFixedChild(EditPart childEditPart) {
-		if (childEditPart instanceof ActivityPartitionName2EditPart) {
-			((ActivityPartitionName2EditPart) childEditPart)
-					.setLabel(getPrimaryShape().getFigurePartitionLabelFigure());
-			return true;
-		}
-		return false;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean removeFixedChild(EditPart childEditPart) {
-		return false;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected NodeFigure createNodePlate() {
-		return new DefaultSizeNodeFigure(getMapMode().DPtoLP(40), getMapMode()
-				.DPtoLP(40));
-	}
-
-	/**
-	 * 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
-	 */
-	protected NodeFigure createNodeFigure() {
-		NodeFigure figure = createNodePlate();
-		figure.setLayoutManager(new StackLayout());
-		IFigure shape = createNodeShape();
-		figure.add(shape);
-		contentPane = setupContentPane(shape);
-		return figure;
-	}
-
-	/**
-	 * Default implementation treats passed figure as content pane.
-	 * Respects layout one may have set for generated figure.
-	 * @param nodeShape instance of generated figure class
-	 * @modified
-	 */
-	protected IFigure setupContentPane(IFigure nodeShape) {
-		if (nodeShape.getLayoutManager() == null) {
-			nodeShape.setLayoutManager(new GravityConstrainedFlowLayout() {
-
-				public Object getConstraint(IFigure figure) {
-					//					Object result = constraints.get(figure);
-					//					if (result == null) {
-					//						result = new Rectangle(0, 0, -1, -1);
-					//					}
-					//					return result;
-					return super.getConstraint(figure);
-				}
-
-				public void setGravity(GravityDirectionType gravity) {
-					// TODO Auto-generated method stub
-					super.setGravity(GravityDirectionType.EAST);
-				}
-			});
-		}
-		return nodeShape; // use nodeShape itself as contentPane
-	}
-
-	/**
-	 * @generated
-	 */
-	public IFigure getContentPane() {
-		if (contentPane != null) {
-			return contentPane;
-		}
-		return super.getContentPane();
-	}
-
-	/**
-	 * @generated
-	 */
-	public EditPart getPrimaryChildEditPart() {
-		return getChildBySemanticHint(UMLVisualIDRegistry
-				.getType(ActivityPartitionName2EditPart.VISUAL_ID));
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void addChildVisual(EditPart childEditPart, int index) {
-		if (addFixedChild(childEditPart)) {
-			return;
-		}
-		super.addChildVisual(childEditPart, -1);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void removeChildVisual(EditPart childEditPart) {
-		if (removeFixedChild(childEditPart)) {
-			return;
-		}
-		super.removeChildVisual(childEditPart);
-	}
-
-	/**
-	 * @generated
-	 */
-	public class ActivityPartitionFigure extends
-			org.eclipse.draw2d.RectangleFigure {
-
-		/**
-		 * @generated
-		 */
-		public ActivityPartitionFigure() {
-
-			org.eclipse.draw2d.XYLayout myGenLayoutManager = new org.eclipse.draw2d.XYLayout();
-
-			this.setLayoutManager(myGenLayoutManager);
-
-			this.setForegroundColor(org.eclipse.draw2d.ColorConstants.black
-
-			);
-			this.setBackgroundColor(ACTIVITYPARTITIONFIGURE_BACK
-
-			);
-			this.setPreferredSize(getMapMode().DPtoLP(400), getMapMode()
-					.DPtoLP(800));
-			this.setSize(getMapMode().DPtoLP(100), getMapMode().DPtoLP(200));
-			this.setBorder(new org.eclipse.draw2d.LineBorder());
-			createContents();
-		}
-
-		/**
-		 * @generated
-		 */
-		private void createContents() {
-			org.eclipse.gmf.runtime.draw2d.ui.figures.WrapLabel fig_0 = new org.eclipse.gmf.runtime.draw2d.ui.figures.WrapLabel();
-
-			setFigurePartitionLabelFigure(fig_0);
-
-			Object layData0 = null;
-
-			this.add(fig_0, layData0);
-		}
-
-		/**
-		 * @generated
-		 */
-		private org.eclipse.gmf.runtime.draw2d.ui.figures.WrapLabel fPartitionLabelFigure;
-
-		/**
-		 * @generated
-		 */
-		public org.eclipse.gmf.runtime.draw2d.ui.figures.WrapLabel getFigurePartitionLabelFigure() {
-			return fPartitionLabelFigure;
-		}
-
-		/**
-		 * @generated
-		 */
-		private void setFigurePartitionLabelFigure(
-				org.eclipse.gmf.runtime.draw2d.ui.figures.WrapLabel fig) {
-			fPartitionLabelFigure = fig;
-		}
-
-		/**
-		 * @generated
-		 */
-		private boolean myUseLocalCoordinates = false;
-
-		/**
-		 * @generated
-		 */
-		protected boolean useLocalCoordinates() {
-			return myUseLocalCoordinates;
-		}
-
-		/**
-		 * @generated
-		 */
-		protected void setUseLocalCoordinates(boolean useLocalCoordinates) {
-			myUseLocalCoordinates = useLocalCoordinates;
-		}
-
-	}
-
-	/**
-	 * @generated
-	 */
-	public static final org.eclipse.swt.graphics.Color ACTIVITYPARTITIONFIGURE_BACK = new org.eclipse.swt.graphics.Color(
-			null, 255, 255, 255);
-
-	/**
-	 * @see org.eclipse.gmf.runtime.diagram.ui.editparts.ShapeEditPart#refreshVisuals()
-	 * @modified
-	 */
-	protected void refreshVisuals() {
-		Node view = (Node) getChildViewBySemanticHint(new Integer(
-				ActivityPartitionName2EditPart.VISUAL_ID).toString());
-		Node parentView = (Node) getModel();
-		Location location = (Location) view.getLayoutConstraint();
-		if (location.getX() > 0) {
-			IMapMode mapMode = MeasurementUnitHelper.getMapMode(parentView
-					.getDiagram().getMeasurementUnit());
-			location.setX(mapMode.DPtoLP(0));
-			location.setY(mapMode.DPtoLP(5));
-		}
-		super.refreshVisuals();
-	}
-
-	/**
-	 * @see org.eclipse.gef.editparts.AbstractEditPart#refreshChildren()
-	 * @modified
-	 */
-	protected void refreshChildren() {
-		// TODO Auto-generated method stub
-		super.refreshChildren();
-	}
-
-}
diff --git a/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/edit/parts/ActivityPartitionName2EditPart.java b/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/edit/parts/ActivityPartitionName2EditPart.java
deleted file mode 100644
index 324d8cd..0000000
--- a/deprecated_plugins/org.eclipse.epf.diagramming/src/org/eclipse/epf/diagramming/edit/parts/ActivityPartitionName2EditPart.java
+++ /dev/null
@@ -1,642 +0,0 @@
-//------------------------------------------------------------------------------
-// Copyright (c) 2005, 2007 IBM Corporation 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:
-// IBM Corporation - initial implementation
-//------------------------------------------------------------------------------
-/*
- * Copyright (c) 2005, 2006 IBM Corporation 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:
- * IBM Corporation - initial implementation
- *
- */
-package org.eclipse.epf.diagramming.edit.parts;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.Label;
-import org.eclipse.draw2d.geometry.Dimension;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.draw2d.geometry.Rectangle;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.transaction.RunnableWithResult;
-import org.eclipse.epf.diagramming.edit.policies.UMLTextSelectionEditPolicy;
-import org.eclipse.epf.diagramming.part.EPFDiagramEditorPlugin;
-import org.eclipse.epf.diagramming.providers.UMLElementTypes;
-import org.eclipse.gef.AccessibleEditPart;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.GraphicalEditPart;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.editpolicies.NonResizableEditPolicy;
-import org.eclipse.gef.handles.NonResizableHandleKit;
-import org.eclipse.gef.requests.DirectEditRequest;
-import org.eclipse.gef.tools.DirectEditManager;
-import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;
-import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;
-import org.eclipse.gmf.runtime.common.ui.services.parser.ParserEditStatus;
-import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;
-import org.eclipse.gmf.runtime.common.ui.services.parser.ParserService;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.CompartmentEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;
-import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;
-import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;
-import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.WrapLabel;
-import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;
-import org.eclipse.gmf.runtime.emf.ui.services.parser.ParserHintAdapter;
-import org.eclipse.gmf.runtime.notation.FontStyle;
-import org.eclipse.gmf.runtime.notation.NotationPackage;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.jface.text.contentassist.IContentAssistProcessor;
-import org.eclipse.jface.viewers.ICellEditorValidator;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.accessibility.AccessibleEvent;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.graphics.FontData;
-import org.eclipse.swt.graphics.Image;
-
-/**
- * @generated
- */
-public class ActivityPartitionName2EditPart extends CompartmentEditPart
-		implements ITextAwareEditPart {
-
-	/**
-	 * @generated
-	 */
-	public static final int VISUAL_ID = 4007;
-
-	/**
-	 * @generated
-	 */
-	private DirectEditManager manager;
-
-	/**
-	 * @generated
-	 */
-	private IParser parser;
-
-	/**
-	 * @generated
-	 */
-	private List parserElements;
-
-	/**
-	 * @generated
-	 */
-	private String defaultText;
-
-	/**
-	 * @generated
-	 */
-	public ActivityPartitionName2EditPart(View view) {
-		super(view);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE,
-				new LabelDirectEditPolicy());
-		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE,
-				new NonResizableEditPolicy() {
-
-					protected List createSelectionHandles() {
-						List handles = new ArrayList();
-						NonResizableHandleKit.addMoveHandle(
-								(GraphicalEditPart) getHost(), handles);
-						return handles;
-					}
-
-					public Command getCommand(Request request) {
-						return null;
-					}
-
-					public boolean understandsRequest(Request request) {
-						return false;
-					}
-				});
-	}
-
-	/**
-	 * @generated
-	 */
-	protected String getLabelTextHelper(IFigure figure) {
-		if (figure instanceof WrapLabel) {
-			return ((WrapLabel) figure).getText();
-		} else {
-			return ((Label) figure).getText();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLabelTextHelper(IFigure figure, String text) {
-		if (figure instanceof WrapLabel) {
-			((WrapLabel) figure).setText(text);
-		} else {
-			((Label) figure).setText(text);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Image getLabelIconHelper(IFigure figure) {
-		if (figure instanceof WrapLabel) {
-			return ((WrapLabel) figure).getIcon();
-		} else {
-			return ((Label) figure).getIcon();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLabelIconHelper(IFigure figure, Image icon) {
-		if (figure instanceof WrapLabel) {
-			((WrapLabel) figure).setIcon(icon);
-		} else {
-			((Label) figure).setIcon(icon);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setLabel(WrapLabel figure) {
-		unregisterVisuals();
-		setFigure(figure);
-		defaultText = getLabelTextHelper(figure);
-		registerVisuals();
-		refreshVisuals();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected List getModelChildren() {
-		return Collections.EMPTY_LIST;
-	}
-
-	/**
-	 * @generated
-	 */
-	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected EObject getParserElement() {
-		EObject element = resolveSemanticElement();
-		return element != null ? element : (View) getModel();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Image getLabelIcon() {
-		ImageDescriptor descriptor = EPFDiagramEditorPlugin.getInstance()
-				.getItemImageDescriptor(getParserElement());
-		if (descriptor == null) {
-			descriptor = ImageDescriptor.getMissingImageDescriptor();
-		}
-		return descriptor.createImage();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected String getLabelText() {
-		String text = null;
-		if (getParser() != null) {
-			text = getParser().getPrintString(
-					new EObjectAdapter(getParserElement()),
-					getParserOptions().intValue());
-		}
-		if (text == null || text.length() == 0) {
-			text = defaultText;
-		}
-		return text;
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setLabelText(String text) {
-		setLabelTextHelper(getFigure(), text);
-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public String getEditText() {
-		if (getParser() == null) {
-			return ""; //$NON-NLS-1$
-		}
-		return getParser().getEditString(
-				new EObjectAdapter(getParserElement()),
-				getParserOptions().intValue());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean isEditable() {
-		return getEditText() != null;
-	}
-
-	/**
-	 * @generated
-	 */
-	public ICellEditorValidator getEditTextValidator() {
-		return new ICellEditorValidator() {
-
-			public String isValid(final Object value) {
-				if (value instanceof String) {
-					final EObject element = getParserElement();
-					final IParser parser = getParser();
-					try {
-						IParserEditStatus valid = (IParserEditStatus) getEditingDomain()
-								.runExclusive(new Runnable